Anatol Belski [Wed, 17 Dec 2014 10:53:45 +0000 (11:53 +0100)]
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master:
Better fix for #68601 for perf https://bitbucket.org/libgd/gd-libgd/commits/81e9a993f2893d651d225646378e3fd1b7465467
Added EXPECTED(). Most functions have arguments.
Anatol Belski [Wed, 17 Dec 2014 04:29:36 +0000 (05:29 +0100)]
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master:
fix unserializer patch
move this entry to the correct version
add missing NEWS entry
add missing NEWS entry
Updated or skipped certain 32-bit tests
add NEWS entry for #68594
5.4.37
add more BC breaks
update news
add CVE
add missing test file
Fix bug #68594 - Use after free vulnerability in unserialize()
Fix typo
Hash value must not zero?
Dmitry Stogov [Tue, 16 Dec 2014 15:40:52 +0000 (18:40 +0300)]
Optimize argument passing handlers:
- predcalculate offsets of passed argument and store it in opline->result.var for ZEND_SEND_*;
- don't update "number of passed arguments" op each ZEND_SEND_* opcode, store it on call frame creation
- Change ZEND_HANDLE_EXCEPTION to determine "number of passed arguments" in incomplete calls fefore freeing
Anatol Belski [Tue, 16 Dec 2014 08:12:09 +0000 (09:12 +0100)]
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.
Anatol Belski [Tue, 16 Dec 2014 07:26:34 +0000 (08:26 +0100)]
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.
Anatol Belski [Tue, 16 Dec 2014 07:04:51 +0000 (08:04 +0100)]
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
Anatol Belski [Mon, 15 Dec 2014 12:57:43 +0000 (13:57 +0100)]
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)
Anatol Belski [Mon, 15 Dec 2014 06:01:29 +0000 (07:01 +0100)]
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
@@ 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
Anatol Belski [Sun, 14 Dec 2014 18:44:24 +0000 (19:44 +0100)]
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
Anatol Belski [Sun, 14 Dec 2014 13:22:42 +0000 (14:22 +0100)]
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.
projects / php / log