1
0
mirror of https://github.com/php/php-src.git synced 2026-04-21 15:08:16 +02:00
Commit Graph

222 Commits

Author SHA1 Message Date
Dmitry Stogov 477bd49cca Wrong expectation in tests (for some reason backtraces contained invlalid extra frame at the top) 2014-07-07 18:09:17 +04:00
Dmitry Stogov dd1c68e67f Merge branch 'master' into phpng
* master: (77 commits)
  NEWS entry for Fix potential segfault in dns_get_record()
  NEWS entry for "Fix potential segfault in dns_get_record()"
  NEWS entry for Fix potential segfault in dns_get_record(
  Fix potential segfault in dns_get_record()
  Revert "Add optional second arg to unserialize()"
  5.5.15 now
  update NEWS
  Fix bug #66127 (Segmentation fault with ArrayObject unset)
  5.4.31 next
  Add NEWS. This doesn't need UPGRADING (or an RFC), IMO.
  Fix broken test.
  Add a mime type map generation script and update the header.
  Move the mime type map out of php_cli_server.c for easier generation.
  Replace the CLI server's linear search for extensions with a hash table.
  fix test
  Remove unused included file
  NEWS
  NEWS
  NEWS
  Fixed Bug #67413 	fileinfo: cdf_read_property_info insufficient boundary chec
  ...

Conflicts:
	Zend/zend_closures.c
	Zend/zend_execute.c
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
	ext/spl/spl_array.c
	ext/standard/basic_functions.c
	ext/standard/dns.c
	ext/standard/var.c
2014-06-12 05:07:33 +04:00
Stanislav Malyshev 1b8d4695e2 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  add news
  Bug 49898 __getCookies() method implementation
2014-06-08 19:46:12 -07:00
Boro Sitnikovski aebb23e4db Bug 49898
__getCookies() method implementation
2014-06-08 19:36:18 -07:00
Dmitry Stogov fe7d22ddd4 it make no sense to create a reference to object 2014-05-16 20:20:17 +04:00
Dmitry Stogov 1da1b989cf Fixed wrong backtrace (__doRequest is not a static method). The "master" behavior is wrong. 2014-05-16 13:41:27 +04:00
Dmitry Stogov 0344e6a429 Fixed tests 2013-12-12 13:35:37 +04:00
Dmitry Stogov 552e8b2b4c Fixed bug #66112 (Use after free condition in SOAP extension). (martin dot koegler at brz dot gv dot at) 2013-12-10 17:57:05 +04:00
Dmitry Stogov 35872e101b Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fixed bug #65018 (SoapHeader problems with SoapServer)
  MFH: fixed #65045: mb_convert_encoding breaks well-formed character.
  Fixed bug #65336

Conflicts:
	NEWS
2013-07-31 16:34:26 +04:00
Dmitry Stogov fd8f454520 Fixed bug #65018 (SoapHeader problems with SoapServer) 2013-07-31 16:32:26 +04:00
Anatol Belski 8aebe0f1e7 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fixed bug #65311 testsuite failure due to incomplete fix to bug28985.phpt
2013-07-23 10:00:07 +02:00
Anatol Belski 9b6aa268a3 fixed bug #65311 testsuite failure due to incomplete fix to bug28985.phpt 2013-07-23 09:59:08 +02:00
Veres Lajos e9a95d78ef typo fixes 2013-07-15 00:23:03 -07:00
Veres Lajos 72085b0e5f typo fixes 2013-07-15 00:18:57 -07:00
Stanislav Malyshev 02e4d7a290 Merge branch 'pull-request/341'
* pull-request/341: (23 commits)
  typofixes
2013-06-10 14:30:59 -07:00
Stanislav Malyshev ac40c0b562 Merge branch 'pull-request/341'
* pull-request/341: (23 commits)
  typofixes
2013-06-10 14:20:18 -07:00
Nikita Popov 0e25e00ecf Fix whitespace issue in the SOAP test 2013-03-28 19:10:57 +01:00
Nikita Popov a5e606a2ba Fix SOAP test
Doesn't look like these warnings are present anymore.
2013-03-28 19:05:06 +01:00
Xinchen Hui e081c55fb5 Merge branch 'PHP-5.3' into PHP-5.4 2012-10-10 10:31:31 +08:00
Xinchen Hui 610c7fbe7b Remove executable permission on phpt 2012-10-10 10:27:49 +08:00
Xinchen Hui 4b152e5470 Merge branch 'PHP-5.4' 2012-10-10 10:32:38 +08: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
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
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
Stanislav Malyshev d42917b605 test fixes 2011-12-26 03:22:07 +00:00
Dmitry Stogov d1432d434c Fixed bug #54911 (Access to a undefined member in inherit SoapClient may cause Segmentation Fault) 2011-11-28 14:20:35 +00:00
Dmitry Stogov 66b38195d2 Fixed bug #54911 (Access to a undefined member in inherit SoapClient may cause Segmentation Fault) 2011-11-28 14:20:35 +00:00
Dmitry Stogov cf2803d463 Fixed bug #44686 (SOAP-ERROR: Parsing WSDL with references) 2011-11-14 08:43:00 +00:00
Dmitry Stogov 72660567f4 Fixed bug #44686 (SOAP-ERROR: Parsing WSDL with references) 2011-11-14 08:43:00 +00:00
Pierre Joye 618d638898 - skip on win, diff TZ format 2011-09-07 11:26:59 +00:00
Pierre Joye a2252e527f - skip on win, diff TZ format 2011-09-07 11:26:59 +00:00
Dmitry Stogov 6ddfa33aad Fixed bug #55323 (SoapClient segmentation fault when XSD_TYPEKIND_EXTENSION contains itself) 2011-08-10 13:44:48 +00:00
Dmitry Stogov 5cb244aad2 Fixed bug #55323 (SoapClient segmentation fault when XSD_TYPEKIND_EXTENSION contains itself) 2011-08-10 13:44:48 +00:00
Pierre Joye 0d7487da46 - fix test 2010-12-18 13:34:22 +00:00
Pierre Joye 1be3dc76af - NEWS update and test related to the NULL poisoning recent fixes 2010-12-18 12:51:23 +00:00
Felipe Pena afed1468e4 - Added missing SKIPIF 2010-08-06 23:05:39 +00:00
Felipe Pena 13d42b168f - Added missing SKIPIF 2010-08-06 23:05:39 +00:00
Dmitry Stogov 42d25dc2b2 Fixed bug #50762 (in WSDL mode Soap Header handler function only being called if defined in WSDL). (mephius at gmail dot com) 2010-05-28 10:52:16 +00:00
Dmitry Stogov 5f678b58e6 Fixed bug #50762 (in WSDL mode Soap Header handler function only being called if defined in WSDL). (mephius at gmail dot com) 2010-05-28 10:52:16 +00:00
Dmitry Stogov 6597e85562 Fixed bug #50698 (SoapClient should handle wsdls with some incompatiable endpoints). (Justin Dearing) 2010-05-05 07:43:45 +00:00
Dmitry Stogov fa0a07ba97 Fixed bug #50698 (SoapClient should handle wsdls with some incompatiable endpoints). (Justin Dearing) 2010-05-05 07:43:45 +00:00
Felipe Pena a90c801c2f - Fixed tests 2010-04-03 15:42:42 +00:00
Felipe Pena 4d571dee74 - Fixed tests 2010-04-03 15:42:42 +00:00