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
86978 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Anatol Belski dec8eb431a noted the TSRM changes to UPGRADING.INTERNALS 2014-12-18 09:09:02 +01:00
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
Anatol Belski 79354ba6d0 fix integral constant overflow warning 
as it's promoted to size_t when passed to ZEND_CALL_ARG
PRE_NATIVE_TLS_MERGE 		2014-12-17 16:47:05 +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 8122bee654 enable static tsrmls cache in the embed SAPI 2014-12-17 10:58:31 +01:00
Anatol Belski af21b3b6dc get rid of TSRMLS_* in the embed SAPI 2014-12-17 10:52:28 +01:00
Dmitry Stogov 4d21ad31dd Added EXPECTED(). Most functions have arguments. 2014-12-17 12:16:02 +03: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
Xinchen Hui cf84bf53ea Merge branch 'fix-typo' of https://github.com/gustavotemple/php-src 2014-12-17 11:52:42 +08:00
Xinchen Hui cfc8b57342 Merge branch 'master' of https://git.php.net/repository/php-src 2014-12-17 11:52:19 +08:00
Stanislav Malyshev 8b0deb8cd2 fix unserializer patch 2014-12-16 17:50:54 -08:00
Ferenc Kovacs 5ab1ddacca Merge branch 'PHP-5.6' 
* PHP-5.6:
  move this entry to the correct version
 2014-12-17 02:18:43 +01:00
Ferenc Kovacs ffae8f1549 move this entry to the correct version 2014-12-17 02:18:29 +01:00
Ferenc Kovacs 63509691b8 Merge branch 'PHP-5.6' 
* PHP-5.6:
  add missing NEWS entry
  add missing NEWS entry
  5.4.37
 2014-12-17 02:15:36 +01:00
Ferenc Kovacs 54b3871b11 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  add missing NEWS entry
  add missing NEWS entry
  5.4.37
 2014-12-17 02:14:25 +01:00
Ferenc Kovacs 5a67d9a229 add missing NEWS entry 2014-12-17 02:13:59 +01:00
Ferenc Kovacs 925fa271ec Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  add missing NEWS entry
  5.4.37

Conflicts:
	configure.in
	main/php_version.h
 2014-12-17 02:13:13 +01:00
Ferenc Kovacs cd387b4575 add missing NEWS entry 2014-12-17 02:10:36 +01: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
Ferenc Kovacs d3dc3388cc Merge branch 'PHP-5.6' 
* PHP-5.6:
  add NEWS entry for #68594
 2014-12-17 02:00:12 +01:00
Ferenc Kovacs c6a7d1eaed add NEWS entry for #68594 2014-12-17 01:59:38 +01:00
Stanislav Malyshev 8fe4cc6d28 5.4.37 2014-12-16 11:44:41 -08:00
Stanislav Malyshev a4ddd3a636 add more BC breaks 2014-12-16 11:00:51 -08: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 8efd73c4d2 update news 2014-12-16 10:18:07 -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 53f129a44d add CVE 2014-12-16 10:16:31 -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
Dmitry Stogov 3a18597774 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
 2014-12-16 18:40:52 +03:00
Anatol Belski 5ea8c3cefc don't need this in nts mode 2014-12-16 14:52:35 +01:00
Andrea Faulds ea7f768b2f Fix pcre non-FAST_ZPP build 2014-12-16 12:45:41 +00:00
Anatol Belski 89f87576a1 various fixes for removing explicit tsrm_ls usage 2014-12-16 12:56:00 +01:00
Anatol Belski 9d70df24f8 Merge remote-tracking branch 'origin/master' into native-tls 
* origin/master:
  C89 fixes
  use portable struct stat
  fixed macro va args expansion for vs
 2014-12-16 12:22:27 +01:00
Anatol Belski 673003757f C89 fixes 2014-12-16 12:20:59 +01:00
Anatol Belski bee4a28433 use portable struct stat 2014-12-16 12:20:58 +01:00
Anatol Belski f1d1185c64 fixed macro va args expansion for vs 2014-12-16 12:20:57 +01:00
Anatol Belski 24f0d2ed54 make the TSRM macros depend no the macroed cache name 2014-12-16 10:44:43 +01: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