clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-01 23:06:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
73,183 Commits 494 Branches 1,367 Tags 802 MiB
acd160530a
Commit Graph

703 Commits

Author SHA1 Message Date
Nikita Popov
fcc6611de9 Add support for non-scalar Iterator keys in foreach 
RFC: https://wiki.php.net/rfc/foreach-non-scalar-keys
 2013-03-12 17:27:31 +01:00
Johannes Schlüter
7b719235b3 Merge branch 'PHP-5.4' into PHP-5.5 2013-02-21 15:10:47 +01:00
Johannes Schlüter
1e9bc56775 Merge branch 'PHP-5.3' into PHP-5.4 2013-02-21 15:10:15 +01:00
Johannes Schlüter
fcd4b5335a Fix TSRM (after afc1debb) 2013-02-21 15:08:58 +01:00
Dmitry Stogov
20c623c9be Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed external entity loading
 2013-02-20 22:30:59 +04:00
Dmitry Stogov
c737b89473 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed external entity loading

Conflicts:
	ext/libxml/libxml.c
	ext/libxml/php_libxml.h
 2013-02-20 22:27:41 +04:00
Dmitry Stogov
8e76d0404b Fixed external entity loading 2013-02-20 22:14:59 +04:00
Dmitry Stogov
1bde2b4fc9 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Proper bit reset code
 2013-02-13 22:07:57 +04:00
Dmitry Stogov
4b900f4831 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Proper bit reset code
 2013-02-13 22:07:21 +04:00
Dmitry Stogov
188c196d4d Proper bit reset code 2013-02-13 22:06:37 +04:00
Dmitry Stogov
0547a36e95 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Disabled external entities loading
 2013-02-07 16:09:49 +04:00
Dmitry Stogov
1a18e84822 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Disabled external entities loading
 2013-02-07 16:09:12 +04:00
Dmitry Stogov
afe98b7829 Disabled external entities loading 2013-02-07 16:07:05 +04:00
Dmitry Stogov
4730bc8680 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Check if soap.wsdl_cache_dir confirms to open_basedir
 2013-02-07 13:12:01 +04:00
Dmitry Stogov
702b436ef4 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Check if soap.wsdl_cache_dir confirms to open_basedir
 2013-02-07 13:10:04 +04:00
Dmitry Stogov
cc4c318b0c Check if soap.wsdl_cache_dir confirms to open_basedir 2013-02-07 13:04:47 +04:00
Xinchen Hui
a666285bc2 Happy New Year 2013-01-01 16:37:09 +08:00
Xinchen Hui
0a7395e009 Happy New Year 2013-01-01 16:28:54 +08:00
Xinchen Hui
a2045ff332 Happy New Year~ 2013-01-01 16:02:16 +08:00
Dmitry Stogov
9e1d3cfdab Fixed bug #63271 (SOAP wsdl cache is not enabled after initial requests) 2012-11-29 16:44:19 +04:00
Dmitry Stogov
7f7cff0bbb Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #63271 (SOAP wsdl cache is not enabled after initial requests)

Conflicts:
	NEWS
	ext/soap/soap.c
 2012-11-29 16:41:09 +04:00
Dmitry Stogov
dc2192c087 Fixed bug #63271 (SOAP wsdl cache is not enabled after initial requests) 2012-11-29 16:31:08 +04:00
Xinchen Hui
610c7fbe7b Remove executable permission on phpt 2012-10-10 10:27:49 +08:00
Xinchen Hui
e081c55fb5 Merge branch 'PHP-5.3' into PHP-5.4 2012-10-10 10:31:31 +08:00
Xinchen Hui
4b152e5470 Merge branch 'PHP-5.4' 2012-10-10 10:32:38 +08:00
Dmitry Stogov
2659f5e88e Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice) 2012-09-03 11:52:42 +04:00
Dmitry Stogov
33db8c0ef6 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice).
 2012-09-03 11:51:17 +04:00
Dmitry Stogov
485c09a376 Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice). 2012-09-03 11:49:58 +04:00
Dmitry Stogov
38476a1543 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice)
 2012-09-03 11:47:59 +04:00
Dmitry Stogov
7e816c0921 Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice) 2012-09-03 11:46:47 +04:00
Dmitry Stogov
4cca6241e0 Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice) 2012-09-03 11:38:08 +04:00
Johannes Schlüter
b025b9d0cf Fix #62432 ReflectionMethod random corrupt memory on high concurrent 
This fixes the same issue in multiple extensions. This isn't needed
in later branches as 5.4 introduced object_properties_init()
 2012-06-27 23:26:33 +02:00
Nuno Lopes
af2d6a63bf remove remaining traces of unicode.* ini settings 2012-05-27 19:57:34 -04:00
zoe slattery
968dfae6d1 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Change impl of GZIP_POST, DEFLATE_POST. See #62021
 2012-05-15 11:06:14 +01:00
zoe slattery
1af8b3f883 Change impl of GZIP_POST, DEFLATE_POST. See #62021 2012-05-15 11:05:20 +01:00
Anatoliy Belsky
4ac6862fc4 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug 61719 ext\soap\tests\bugs\bug31422.phpt fails
 2012-04-16 15:40:10 +02:00
Anatoliy Belsky
9c8907ec10 Fix bug 61719 ext\soap\tests\bugs\bug31422.phpt fails 2012-04-16 15:38:46 +02:00
Ilia Alshanetsky
9c5ae9954f Fixed bug #61423 (gzip compression fails). 2012-04-03 08:47:00 -04:00
Hannes Magnusson
7a1c765385 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  This is a git checkout
  Revert incorrect fix
 2012-03-24 17:20:14 +01:00
Ilia Alshanetsky
8d0760f38a Revert incorrect fix 2012-03-24 12:27:55 -04:00
Ilia Alshanetsky
f9f631fb76 Fixed bug #61423 (gzip compression fails). 
Conflicts:

	NEWS
 2012-03-22 09:46:33 -04:00
Ilia Alshanetsky
b4aea52682 Fixed bug #61423 (gzip compression fails). 2012-03-22 09:13:45 -04:00
Dmitry Stogov
a8cc0b05b4 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #49853 (Soap Client stream context header option ignored)

Conflicts:
	NEWS
	ext/soap/php_sdl.c
 2012-03-21 16:42:08 +04:00
Dmitry Stogov
657547f8c4 Fixed bug #49853 (Soap Client stream context header option ignored) 2012-03-21 16:32:49 +04:00
Ilia Alshanetsky
aee5a9864d Fixed bug #60842, #51775 (Chunked response parsing error when chunksize length line is > 10 bytes). 2012-03-08 20:14:26 +00:00
Ilia Alshanetsky
b61f335b9d Fixed bug #60842, #51775 (Chunked response parsing error when chunksize length line is > 10 bytes). 2012-03-08 20:14:26 +00:00
Dmitry Stogov
a05a3a0a4a Fixed bug #60887 (SoapClient ignores user_agent option and sends no User-Agent header) 2012-03-05 12:59:01 +00:00
Dmitry Stogov
f05886dbcb Fixed bug #60887 (SoapClient ignores user_agent option and sends no User-Agent header) 2012-03-05 12:59:01 +00:00
Olivier DOUCET
e613889d50 more verbose skip reason in test files with not so obvious extension requirements 2012-02-25 12:10:41 +00:00
Olivier DOUCET
ce535f1819 more verbose skip reason in test files with not so obvious extension requirements 2012-02-25 12:10:41 +00:00