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

81037 Commits

Author SHA1 Message Date
Xinchen Hui d74f5ab3df Refactored ext/xsl, need some help in 3 tests failed 2014-05-15 17:43:44 +08:00
Dmitry Stogov c446e57588 ext/soap support for phpng (incomplete - just compilable) 2014-05-15 02:44:47 +04:00
Pierre Joye 3ae86b9cce Merge branch 'phpng' of git.php.net:php-src into phpng
# By Stanislav Malyshev (15) and others
# Via Stanislav Malyshev (15) and others
* 'phpng' of git.php.net:php-src: (53 commits)
  Use defined macro
  Refactored tidy (all tests passes)
  Reverted wrong commit Xinchen, stop commit changed configs :) You may use environment variables to ovverride default settings
  Fixed reference counting, IS_REFERENCE and IS_INDIRECT support
  Terminate string Useproper hash function
  C89 compat
  Fixed curl_close() behavior
  In most user extensions functions like mysql_close() should use zend_list_close() instead of zend_list_delete(). This closes the actual connection and frees extension specific data structures, but doesn't free zend_reference structure that might be referenced from zval(s). This also doesn't decrement the resource reference counter.
  Fixed access to uninitialized data and attempt to double free
  Fixed safe resource close. It must not de deleted (just closed), because it still may be referenced from zval(s). This fixes few ext/ftp test memory failures detected with valgrind.
  Nested PCRE calls may clobber extra->mark and it has to be reinitailized This fixes invalid memory writes (detected with valgrind) in Zend/tests/closure_047.phpt and Zend/tests/closure_048.phpt.
  Added comment
  fix test - output can be chunked
  fix test
  fix test
  Fixed test for commit 997be125eb
  Add bug fix to NEWS
  Update UPGRADING according to bug fix
  fix test
  improve CURL tests to allow testing without separate server
  ...
2014-05-14 20:06:58 +02:00
Pierre Joye 21d270dbaa fix windows build 2014-05-14 20:06:18 +02:00
Pierre Joye 01513976e7 ptr needed here 2014-05-14 20:05:54 +02:00
Xinchen Hui b57b1ff495 Use defined macro 2014-05-14 16:54:14 +08:00
Xinchen Hui 0f6c93d620 Refactored tidy (all tests passes) 2014-05-14 16:44:07 +08:00
Dmitry Stogov c25f09e6ab Reverted wrong commit
Xinchen, stop commit changed configs :)
You may use environment variables to ovverride default settings
2014-05-13 21:29:57 +04:00
Dmitry Stogov a08a1ae2c0 Fixed reference counting, IS_REFERENCE and IS_INDIRECT support 2014-05-13 17:27:37 +04:00
Dmitry Stogov 0eeeaa1a23 Terminate string
Useproper hash function
2014-05-13 16:40:05 +04:00
Dmitry Stogov 275e006734 Merge branch 'phpng' of git.php.net:php-src into phpng
* 'phpng' of git.php.net:php-src:
  C89 compat
2014-05-13 16:06:30 +04:00
Anatol Belski f089d63ddd C89 compat 2014-05-13 14:04:53 +02:00
Dmitry Stogov 3ba4f8263d Fixed curl_close() behavior 2014-05-13 16:00:44 +04:00
Dmitry Stogov 7fcd4064c0 Merge branch 'master' into phpng
* master: (41 commits)
  fix test - output can be chunked
  fix test
  fix test
  Fixed test for commit 997be125eb
  Add bug fix to NEWS
  Update UPGRADING according to bug fix
  fix test
  improve CURL tests to allow testing without separate server
  improve CURL tests to allow testing without separate server
  Fixed bug #67199	mb_regex_encoding mishmash
  Fix bug #67248 (imageaffinematrixget missing check of parameters)
  Fix bug #67247	spl_fixedarray_resize integer overflow
  fix news
  add tests stuff to README
  Updated NEWS
  Fix Linux specific fail in error traces (cherry-picked and fix for bug #67245) Linux apparently does not like memcpy in overlapping regions...
  - Fixed off-by-one in phar_build (patch by crrodriguez at opensuse dot org)
  - Move checking
  - Fixed missing NULL check in SimpleXMLElement::xpath()
  - Fixed missing NULL check
  ...

Conflicts:
	ext/bz2/bz2.c
	ext/gd/gd.c
	ext/mbstring/php_mbregex.c
	ext/session/tests/031.phpt
	ext/simplexml/simplexml.c
	ext/spl/spl_fixedarray.c
2014-05-13 15:24:40 +04:00
Dmitry Stogov b8b8c497c4 In most user extensions functions like mysql_close() should use zend_list_close() instead of zend_list_delete(). This closes the actual connection and frees extension specific data structures, but doesn't free zend_reference structure that might be referenced from zval(s). This also doesn't decrement the resource reference counter. 2014-05-13 13:18:00 +04:00
Dmitry Stogov f1720348ca Fixed access to uninitialized data and attempt to double free 2014-05-13 12:57:42 +04:00
Dmitry Stogov 7b1cb4922f Fixed safe resource close.
It must not de deleted (just closed), because it still may be referenced from zval(s).
This fixes few ext/ftp test memory failures detected with valgrind.
2014-05-13 12:47:34 +04:00
Dmitry Stogov 376ab3b787 Nested PCRE calls may clobber extra->mark and it has to be reinitailized
This fixes invalid memory writes (detected with valgrind) in Zend/tests/closure_047.phpt and Zend/tests/closure_048.phpt.
2014-05-13 12:14:55 +04:00
Dmitry Stogov 88421c6a04 Added comment 2014-05-13 10:22:21 +04:00
Pierre Joye c26d79c854 hash keys now use actual string length without leading zero 2014-05-13 08:11:44 +02:00
Pierre Joye 1b89df4925 Merge branch 'phpng' of git.php.net:php-src into phpng
# By Xinchen Hui
# Via Xinchen Hui
* 'phpng' of git.php.net:php-src:
  Save one type checking if the type is already string
  This should be removed too
  Remove zval **
2014-05-13 08:08:25 +02:00
Xinchen Hui 075a6ced0a Save one type checking if the type is already string 2014-05-13 14:05:28 +08:00
Xinchen Hui 7080131e71 This should be removed too 2014-05-13 13:55:51 +08:00
Xinchen Hui 97c836e421 Remove zval ** 2014-05-13 13:45:24 +08:00
Pierre Joye 11caa1d7b4 port dns_win32 2014-05-13 07:06:27 +02:00
Pierre Joye bc0161b720 Merge branch 'phpng' of git.php.net:php-src into phpng
# By Dmitry Stogov (5) and others
# Via Xinchen Hui (3) and Dmitry Stogov (1)
* 'phpng' of git.php.net:php-src:
  restore unexpected commit
  Convert to unpacked before deleting elements
  - Fixed ZTS build
  Fix memory error in spl_directory.c
  Fix spl_directory cast_object, reenable error
  Support for ext/phar (all tests passed)
  ext/phar support (incomplete)
  Fixed double free (xmlrpc is done, 1 test failed due to knew issue)
  Fixed typo
  Refactoring ext/xmlrpc (incompleted)
  Removed error message that breaks phar
  ext/phar support (incomplete)
  Refactor ext/gd (all tests passes)
  Fixed wrong buffer length (added place for terminating zero)
2014-05-13 06:51:45 +02:00
Pierre Joye d24c5de173 port sendmail to windwos (untested yet) 2014-05-13 06:51:11 +02:00
Pierre Joye dbc6d0df84 port proc_open to windows (untested yet) 2014-05-13 06:50:20 +02:00
Xinchen Hui 618de55485 restore unexpected commit 2014-05-13 12:25:03 +08:00
Xinchen Hui 6037dcd25b Merge branch 'phpng-hash-str-del-fix' of https://github.com/datibbaw/php-src into phpng 2014-05-13 12:23:58 +08:00
Tjerk Meesters e7b50a8ee9 Convert to unpacked before deleting elements
Return FAILURE immediately if a string index removal is attempted.

Moved condition higher up
2014-05-13 11:58:28 +08:00
Felipe Pena 920d298f4a - Fixed ZTS build 2014-05-13 00:34:10 -03:00
Nikita Popov 9f9ee0186e Fix memory error in spl_directory.c 2014-05-12 21:35:39 +02:00
Nikita Popov 8904f72d7c Fix spl_directory cast_object, reenable error 2014-05-12 20:44:30 +02:00
Dmitry Stogov f29b68306d Support for ext/phar (all tests passed) 2014-05-12 22:28:31 +04:00
Stanislav Malyshev c7abe84d94 Merge branch 'PHP-5.6'
* PHP-5.6:
  fix test - output can be chunked
  fix test

Conflicts:
	ext/curl/tests/curl_basic_006.phpt
2014-05-12 10:58:18 -07:00
Stanislav Malyshev 2152e2f127 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix test - output can be chunked

Conflicts:
	ext/curl/tests/curl_basic_006.phpt
2014-05-12 10:56:03 -07:00
Stanislav Malyshev e3ca87265d Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fix test - output can be chunked
2014-05-12 10:54:34 -07:00
Stanislav Malyshev 6ef8e0f088 fix test - output can be chunked 2014-05-12 10:54:16 -07:00
Dmitry Stogov dda4140010 Merge branch 'phpng' of git.php.net:php-src into phpng
* 'phpng' of git.php.net:php-src:
  Fixed double free (xmlrpc is done, 1 test failed due to knew issue)
  Fixed typo
  Refactoring ext/xmlrpc (incompleted)
2014-05-12 16:43:41 +04:00
Dmitry Stogov 4288f0486b ext/phar support (incomplete) 2014-05-12 16:43:18 +04:00
Xinchen Hui b0f434c3dd Fixed double free (xmlrpc is done, 1 test failed due to knew issue) 2014-05-12 20:40:08 +08:00
Xinchen Hui dec5fa6c08 Fixed typo 2014-05-12 19:57:04 +08:00
Xinchen Hui b0329185cc Refactoring ext/xmlrpc (incompleted) 2014-05-12 19:28:06 +08:00
Dmitry Stogov c6c9d1414c Removed error message that breaks phar 2014-05-12 14:03:10 +04:00
Dmitry Stogov dfb10145f7 ext/phar support (incomplete) 2014-05-12 13:31:38 +04:00
Stanislav Malyshev db35409136 fix test 2014-05-12 01:40:39 -07:00
Stanislav Malyshev 9c27063a65 fix test 2014-05-12 01:27:18 -07:00
Xinchen Hui 1be957ebc9 Merge branch 'phpng' of git.php.net:php-src into phpng 2014-05-12 15:55:48 +08:00
Xinchen Hui 9081a1bdfb Refactor ext/gd (all tests passes) 2014-05-12 15:53:35 +08:00