archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 14:08:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
86923 commits 526 branches 1434 tags 866 MiB
Commit graph

86923 commits

This branch
This branch
All branches
Author SHA1 Message Date
Anatol Belski
9e4310eeeb reworked ini dtor 2014-12-16 10:15:02 +01:00
Anatol Belski
eb629b70da free the right globals 
That's the same as in the previous commit. In the TS mode the tsrm
cache pointer might be unavailable or point to a wrong thread, so
the exact globals passed should be freed.
 2014-12-16 09:12:09 +01:00
Anatol Belski
50a93357fb Merge remote-tracking branch 'origin/master' into native-tls 
* origin/master:
  fix perms
  fix perms
  PowerPC64 support in safe_address function
 2014-12-16 08:42:18 +01:00
Remi Collet
62691b2d6a fix perms 2014-12-16 08:38:51 +01:00
Remi Collet
ee0b922ece Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix perms
 2014-12-16 08:38:29 +01:00
Remi Collet
181f34f375 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix perms
 2014-12-16 08:37:56 +01:00
Remi Collet
9c4de388c6 fix perms 2014-12-16 08:37:48 +01:00
Anatol Belski
c0cb3a1dc4 depending on declaration the tsrm cache pointer might be unavailable 
during shutdown when the main thread frees all the other threads
resources. Even otherwise, exact resource passed to the dtor should
be freed, not the one from the current thread.
 2014-12-16 08:26:34 +01:00
Gustavo Frederico Temple Pedrosa
1e82da8d17 PowerPC64 support in safe_address function 
Add a ppc64-specific implementation of the safe_address
function with overflow checking.
 2014-12-16 08:20:01 +01:00
Anatol Belski
209a7a27a5 Merge remote-tracking branch 'origin/master' into native-tls 
* origin/master:
  Revert "Removed useless local variable"
  Fix the fix for bug #55415
  add BC breaks from PHPNG RFC
  add include for definition of php_url_encode
 2014-12-16 08:04:51 +01:00
Anatol Belski
64b423d6ed removed the extra tsrm pointer passed to ctor/dtor 2014-12-16 08:03:15 +01:00
Dmitry Stogov
caf5521416 Revert "Removed useless local variable" 
This reverts commit 44ae32ad55.

It doesn't work properly. We can't access call->scope after free.
 2014-12-16 01:44:10 +03:00
Stanislav Malyshev
d9f277bd16 Fix the fix for bug #55415 2014-12-15 11:40:48 -08:00
Stanislav Malyshev
b65d184d5e add BC breaks from PHPNG RFC 2014-12-15 11:33:28 -08:00
Stanislav Malyshev
e304c3191b add include for definition of php_url_encode 2014-12-15 11:33:27 -08:00
Anatol Belski
bd76a50019 Merge remote-tracking branch 'origin/master' into native-tls 
* origin/master:
  Removed deprecated checks
 2014-12-15 20:18:40 +01:00
Dmitry Stogov
4e48bff3ce Removed deprecated checks 2014-12-15 16:42:28 +03:00
Anatol Belski
f62ad3bc57 Merge remote-tracking branch 'origin/master' into native-tls 
* origin/master:
  made the apache ini holders to be zend_bool
  Removed useless local variable
  Use simpler functions
  Fixed test
  small fixes to UPGRADING
  Reorder to save alignment size (of course, only for common used structs)
 2014-12-15 13:57:43 +01:00
Anatol Belski
178363cbff made the apache ini holders to be zend_bool 
since they're documented to be so and we spare 16 byte
 2014-12-15 13:49:46 +01:00
Dmitry Stogov
44ae32ad55 Removed useless local variable 2014-12-15 14:43:30 +03:00
Dmitry Stogov
dd01ade999 Use simpler functions 2014-12-15 14:43:16 +03:00
Dmitry Stogov
381bd80a79 Fixed test 2014-12-15 12:52:50 +03:00
Anatol Belski
dba27372ec in ext/soap globals are initialized also on minit 2014-12-15 10:52:12 +01:00
Stanislav Malyshev
33b0349ed8 small fixes to UPGRADING 2014-12-14 23:49:43 -08:00
Xinchen Hui
7081c9bca6 Reorder to save alignment size (of course, only for common used structs) 2014-12-15 01:44:53 -05:00
Anatol Belski
61f90fbe0b Merge remote-tracking branch 'origin/master' into native-tls 
* origin/master:
  Save 8 bytes on 64 bits

Conflicts:
	Zend/zend_API.c
 2014-12-15 07:13:09 +01:00
Anatol Belski
5ff59f986c Merge remote-tracking branch 'origin/master' into native-tls 
* origin/master:
  Revert HTTP status codes merger
  fixed tests, bugs in status codes merger
  Fixed bug #55415 (php_info produces invalid anchor names)
  NEWS
  Implement feature request #55467 (phpinfo: PHP Variables with $ and single quotes)
  NEWS
  Change back to use is_int() as function instead of is_integer(), as per Jan Tvrdík's request @github
  NEWS
  Change is_long() to be an alias of is_integer()
  Fix indentation
  Share HTTP status codes map
 2014-12-15 07:01:29 +01:00
Xinchen Hui
8f177fde90 Save 8 bytes on 64 bits 2014-12-15 00:43:28 -05:00
Andrea Faulds
7950429626 Revert HTTP status codes merger 
This reverts commits 65768edcf3, 627b350f31 and 9c18ad3ac9.
 2014-12-15 01:30:58 +00:00
Andrea Faulds
9c18ad3ac9 fixed tests, bugs in status codes merger 2014-12-14 23:41:11 +00:00
Kalle Sommer Nielsen
ad01fd8b49 Fixed bug #55415 (php_info produces invalid anchor names) 
@@ Slightly based off Johannes' patch
 2014-12-14 23:09:13 +01:00
Kalle Sommer Nielsen
9afae43b12 NEWS 2014-12-14 22:49:00 +01:00
Kalle Sommer Nielsen
d82fa2273f Implement feature request #55467 (phpinfo: PHP Variables with $ and single quotes) 2014-12-14 22:47:58 +01:00
Kalle Sommer Nielsen
6b00fba877 NEWS 2014-12-14 22:32:42 +01:00
Kalle Sommer Nielsen
6b8ed592b9 Change back to use is_int() as function instead of is_integer(), as per Jan Tvrdík's request @github 2014-12-14 22:26:16 +01:00
Kalle Sommer Nielsen
a3615aeea4 NEWS 2014-12-14 22:13:07 +01:00
Kalle Sommer Nielsen
04c11f918a Change is_long() to be an alias of is_integer() 
@@ See internals: news.php.net/php.internals/79639
@@ Manual will be updated so that is_int() will be an alias of is_integer()
@@ I picked integer over int for consitentcy as we do not use str instead of string either
 2014-12-14 21:57:07 +01:00
Andrea Faulds
627b350f31 Fix indentation 2014-12-14 19:20:06 +00:00
Andrea Faulds
d450f6aabc Merge branch 'unify_http' 
* unify_http:
  Share HTTP status codes map
 2014-12-14 19:18:23 +00:00
Andrea Faulds
65768edcf3 Share HTTP status codes map 2014-12-14 19:16:51 +00:00
Anatol Belski
a857f3a147 Merge remote-tracking branch 'origin/master' into native-tls 
* origin/master:
  Fix bug #67106 split main fpm config
  split fpm config to two parts. PR#903
  fix typo
  Fix undefined behaviour in strnatcmp
  Fix undefined behaviour in strnatcmp
  Fixed memory leak introduced by 73458e8f
  update NEWS
  move the test to the right place
  Fixed bug #68545 NULL pointer dereference in unserialize.c
 2014-12-14 19:44:24 +01:00
Anatol Belski
0a40e6a3db removed the TS part, as suggested by Dmitry. 
Tests seem to be ok so far
 2014-12-14 19:12:13 +01:00
Remi Collet
855d296638 Fix bug #67106 split main fpm config 2014-12-14 14:23:43 +01:00
Anatol Belski
7b6ed8db2f almost all the replacements of TSRMLS_* are done 
Some places have to be yet touched as they use different/custom
macros namings for the same. Also some places in the code became
redundant now, this is the next task. To name some: ext/mysqlnd,
sapi/embed, ext/curl and some smaller places here and there.
 2014-12-14 14:22:42 +01:00
Elan Ruusamäe
9f189dd290 split fpm config to two parts. PR#903 
main config = global options
secondary config = pool options

makes easier to add new pools:
duplicate pool config in fpm.d dir

https://bugs.php.net/bug.php?id=67106
 2014-12-14 14:21:46 +01:00
Anatol Belski
e112f6a04e second shot on removing TSRMLS_* 2014-12-14 14:07:59 +01:00
Remi Collet
70c141b8f8 Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix typo
 2014-12-14 09:23:25 +01:00
Remi Collet
505adabf25 fix typo 2014-12-14 09:22:59 +01:00
Andrea Faulds
a2038e6826 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix undefined behaviour in strnatcmp
  update NEWS
  move the test to the right place
  Fixed bug #68545 NULL pointer dereference in unserialize.c
 2014-12-13 22:31:20 +00:00
Andrea Faulds
51771ed238 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix undefined behaviour in strnatcmp
  update NEWS
  move the test to the right place
  Fixed bug #68545 NULL pointer dereference in unserialize.c
 2014-12-13 22:30:19 +00:00