bdnugget/php-src
1
0 Fork 0
mirror of https://github.com/bdnugget/php-src.git synced 2026-11-07 09:17:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
86,978 Commits 375 Branches 1,117 Tags
native-tls
Commit Graph
37077 Commits
Author SHA1 Message Date
Anatol Belski e8acb9ff26 Merge remote-tracking branch 'origin/master' into native-tls 
* origin/master:
  fix integral constant overflow warning
  Use HUGE PAGES for opcahce SHM, if available.
 2014-12-17 17:46:48 +01:00
Dmitry Stogov 12ce17c47e Use HUGE PAGES for opcahce SHM, if available. 2014-12-17 14:59:08 +03:00
Anatol Belski e1fcb9ea66 integrated the static tsrmls cache into ext/skel 2014-12-17 12:37:50 +01:00
Anatol Belski 9c354ba182 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.
 2014-12-17 11:53:45 +01:00
Anatol Belski 3b6a8b1163 remove the thread ctx from curl 2014-12-17 11:38:46 +01:00
Anatol Belski 386cb177bd remove unused ZTS macros 2014-12-17 11:05:23 +01:00
Anatol Belski 99d0078ab9 remove TSRMLS_* occurence 2014-12-17 11:03:13 +01:00
Remi Collet f61071205f Merge branch 'PHP-5.6' 
* PHP-5.6:
  Better fix for #68601 for perf https://bitbucket.org/libgd/gd-libgd/commits/81e9a993f2893d651d225646378e3fd1b7465467
 2014-12-17 11:01:23 +01:00
Remi Collet f382fbf4c1 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Better fix for #68601 for perf https://bitbucket.org/libgd/gd-libgd/commits/81e9a993f2893d651d225646378e3fd1b7465467
 2014-12-17 11:00:52 +01:00
Remi Collet 5fc2fede9c Better fix for #68601 for perf 
https://bitbucket.org/libgd/gd-libgd/commits/81e9a993f2893d651d225646378e3fd1b7465467
 2014-12-17 10:59:36 +01:00
Anatol Belski 4acc56d5b2 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?
 2014-12-17 05:29:36 +01:00
Stanislav Malyshev 8b0deb8cd2 fix unserializer patch 2014-12-16 17:50:54 -08:00
Andrea Faulds 43c3ba5b55 Merge branch 'zppFailOnOverflow' 
* zppFailOnOverflow:
  Updated or skipped certain 32-bit tests
 2014-12-17 01:07:39 +00:00
Andrea Faulds 1392102b0c Updated or skipped certain 32-bit tests 2014-12-17 01:06:48 +00:00
Stanislav Malyshev 9152214c1e Merge branch 'PHP-5.6' 
* 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
 2014-12-16 10:25:03 -08:00
Stanislav Malyshev 681a1afd3f Merge branch 'PHP-5.5' into PHP-5.6 
* 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
 2014-12-16 10:19:32 -08:00
Stanislav Malyshev 622a346302 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  add CVE
  add missing test file
  Fix bug #68594 - Use after free vulnerability in unserialize()
 2014-12-16 10:17:07 -08:00
Stanislav Malyshev b75867fff0 add missing test file 2014-12-16 10:15:17 -08:00
Stanislav Malyshev 630f9c33c2 Fix bug #68594 - Use after free vulnerability in unserialize() 2014-12-16 10:15:17 -08:00
Anatol Belski 2eef2abee5 Merge remote-tracking branch 'origin/master' into native-tls 
* 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
 2014-12-16 17:13:47 +01:00
Andrea Faulds ea7f768b2f Fix pcre non-FAST_ZPP build 2014-12-16 12:45:41 +00:00
Anatol Belski a85eb75cba Merge remote-tracking branch 'origin/master' into native-tls 
* 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
 2014-12-16 10:21:05 +01:00
Remi Collet 53c8b180c8 fix perm again... 2014-12-16 10:13:58 +01:00
Remi Collet 5c0e118573 fix bad pointer cast in ext/phar, fix segfault and failed tests (bigendian) 2014-12-16 09:31:20 +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 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
Stanislav Malyshev d9f277bd16 Fix the fix for bug #55415 2014-12-15 11:40:48 -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
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
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
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 d82fa2273f Implement feature request #55467 (phpinfo: PHP Variables with $ and single quotes) 2014-12-14 22:47:58 +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 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
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 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
Anatol Belski e112f6a04e second shot on removing TSRMLS_* 2014-12-14 14:07:59 +01: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
Andrea Faulds f804a3614e Merge branch 'PHP-5.4' into PHP-5.5 
* 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
 2014-12-13 22:28:45 +00:00