summaryrefslogtreecommitdiff
path: root/ext
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-12-171-0/+16
|\ | | | | | | | | | | * origin/master: fix integral constant overflow warning Use HUGE PAGES for opcahce SHM, if available.
| * Use HUGE PAGES for opcahce SHM, if available.Dmitry Stogov2014-12-171-0/+16
| |
* | integrated the static tsrmls cache into ext/skelAnatol Belski2014-12-173-10/+14
| |
* | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-12-171-6/+6
|\ \ | |/ | | | | | | | | * origin/master: Better fix for #68601 for perf https://bitbucket.org/libgd/gd-libgd/commits/81e9a993f2893d651d225646378e3fd1b7465467 Added EXPECTED(). Most functions have arguments.
| * Merge branch 'PHP-5.6'Remi Collet2014-12-171-6/+6
| |\ | | | | | | | | | | | | * PHP-5.6: Better fix for #68601 for perf https://bitbucket.org/libgd/gd-libgd/commits/81e9a993f2893d651d225646378e3fd1b7465467
| | * Merge branch 'PHP-5.5' into PHP-5.6Remi Collet2014-12-171-6/+6
| | |\ | | | | | | | | | | | | | | | | * PHP-5.5: Better fix for #68601 for perf https://bitbucket.org/libgd/gd-libgd/commits/81e9a993f2893d651d225646378e3fd1b7465467
| | | * Better fix for #68601 for perfRemi Collet2014-12-171-6/+6
| | | | | | | | | | | | | | | | https://bitbucket.org/libgd/gd-libgd/commits/81e9a993f2893d651d225646378e3fd1b7465467
* | | | remove the thread ctx from curlAnatol Belski2014-12-172-9/+0
| | | |
* | | | remove unused ZTS macrosAnatol Belski2014-12-171-6/+0
| | | |
* | | | remove TSRMLS_* occurenceAnatol Belski2014-12-171-2/+2
| | | |
* | | | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-12-1721-71/+101
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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?
| * | | fix unserializer patchStanislav Malyshev2014-12-162-36/+32
| | | |
| * | | Merge branch 'zppFailOnOverflow'Andrea Faulds2014-12-1718-11/+33
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * zppFailOnOverflow: Updated or skipped certain 32-bit tests
| | * | | Updated or skipped certain 32-bit testsAndrea Faulds2014-12-1718-11/+33
| | | | |
| * | | | Merge branch 'PHP-5.6'Stanislav Malyshev2014-12-163-60/+72
| |\ \ \ \ | | |/ / / | |/| / / | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: update news add CVE add missing test file Fix bug #68594 - Use after free vulnerability in unserialize() Conflicts: ext/standard/var_unserializer.c ext/standard/var_unserializer.re
| | * | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2014-12-163-32/+62
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: update news add CVE add missing test file Fix bug #68594 - Use after free vulnerability in unserialize() Conflicts: ext/standard/var_unserializer.c
| | | * Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-12-163-32/+62
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: add CVE add missing test file Fix bug #68594 - Use after free vulnerability in unserialize()
| | | | * add missing test fileStanislav Malyshev2014-12-161-0/+7
| | | | |
| | | | * Fix bug #68594 - Use after free vulnerability in unserialize()Stanislav Malyshev2014-12-163-32/+62
| | | | |
* | | | | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-12-161-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/master: Optimize argument passing handlers: Fix pcre non-FAST_ZPP build Conflicts: Zend/zend_compile.c Zend/zend_execute.h Zend/zend_vm_def.h Zend/zend_vm_execute.h ext/pcre/php_pcre.c
| * | | | Fix pcre non-FAST_ZPP buildAndrea Faulds2014-12-161-1/+1
| | | | |
* | | | | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-12-162-7/+8
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/master: fix perm again... cleanup uneeded cast fix bad pointer cast in ext/phar, fix segfault and failed tests (bigendian) Conflicts: ext/phar/func_interceptors.c ext/phar/phar_object.c sapi/apache2handler/sapi_apache2.c
| * | | | fix perm again...Remi Collet2014-12-161-0/+0
| | | | |
| * | | | fix bad pointer cast in ext/phar, fix segfault and failed tests (bigendian)Remi Collet2014-12-162-7/+8
| | | | |
* | | | | free the right globalsAnatol Belski2014-12-161-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-12-162-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | * origin/master: fix perms fix perms PowerPC64 support in safe_address function
| * | | | fix permsRemi Collet2014-12-161-0/+0
| | | | |
| * | | | Merge branch 'PHP-5.6'Remi Collet2014-12-161-0/+0
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * PHP-5.6: fix perms
| | * | | Merge branch 'PHP-5.5' into PHP-5.6Remi Collet2014-12-161-0/+0
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * PHP-5.5: fix perms
| | | * | fix permsRemi Collet2014-12-161-0/+0
| | | | |
| | * | | Merge branch 'PHP-5.5' into PHP-5.6Andrea Faulds2014-12-131-2/+2
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | | * | Merge branch 'PHP-5.4' into PHP-5.5Andrea Faulds2014-12-131-2/+2
| | | |\ \ | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: Fix undefined behaviour in strnatcmp update NEWS move the test to the right place Fixed bug #68545 NULL pointer dereference in unserialize.c Conflicts: NEWS
| | | | * Fix undefined behaviour in strnatcmpAndrea Faulds2014-12-131-2/+2
| | | | |
| | | | * move the test to the right placeAnatol Belski2014-12-111-0/+11
| | | | |
| | | | * Fixed bug #68545 NULL pointer dereference in unserialize.cAnatol Belski2014-12-112-33/+45
| | | | |
* | | | | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-12-161-3/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | | | Fix the fix for bug #55415Stanislav Malyshev2014-12-151-2/+2
| | | | |
| * | | | add include for definition of php_url_encodeStanislav Malyshev2014-12-151-1/+1
| | | | |
* | | | | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-12-151-14/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * origin/master: Removed deprecated checks
| * | | | Removed deprecated checksDmitry Stogov2014-12-151-14/+4
| | | | |
* | | | | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-12-151-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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)
| * | | | Fixed testDmitry Stogov2014-12-151-1/+1
| | | | |
* | | | | in ext/soap globals are initialized also on minitAnatol Belski2014-12-151-0/+3
| | | | |
* | | | | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-12-154-11/+18
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | | | Revert HTTP status codes mergerAndrea Faulds2014-12-152-2/+2
| | | | | | | | | | | | | | | | | | | | This reverts commits 65768edcf3ef27a21a07e5e994bfd9ca1cabfa94, 627b350f31be83eb1d5ac5fad692256dcfaf1281 and 9c18ad3ac9103bc0a6c7b7ab8938fd7272095652.
| * | | | fixed tests, bugs in status codes mergerAndrea Faulds2014-12-142-2/+2
| | | | |
| * | | | Fixed bug #55415 (php_info produces invalid anchor names)Kalle Sommer Nielsen2014-12-141-1/+7
| | | | | | | | | | | | | | | | | | | | @@ Slightly based off Johannes' patch
| * | | | Implement feature request #55467 (phpinfo: PHP Variables with $ and single ↵Kalle Sommer Nielsen2014-12-141-2/+3
| | | | | | | | | | | | | | | | | | | | quotes)
| * | | | Change back to use is_int() as function instead of is_integer(), as per Jan ↵Kalle Sommer Nielsen2014-12-143-7/+7
| | | | | | | | | | | | | | | | | | | | Tvrdík's request @github
| * | | | Change is_long() to be an alias of is_integer()Kalle Sommer Nielsen2014-12-143-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | @@ 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