1
0
mirror of https://github.com/php/php-src.git synced 2026-04-20 14:31:06 +02:00
Commit Graph

34924 Commits

Author SHA1 Message Date
Pierre Joye
19f6476d19 fix void* ptr arithmetic 2014-05-15 18:09:50 +02:00
Pierre Joye
dc4a39ca9c Merge branch 'phpng' of git.php.net:php-src into phpng
# By Dmitry Stogov (4) and others
# Via Xinchen Hui
* 'phpng' of git.php.net:php-src:
  Made a little clean up
  check for EG(excepton)
  key->len doesn't include trailing space anymore
  Fixed WSDL parsing
  add support for pdo-pgsql in phpng refactoring
  Fixed memory leaks
2014-05-15 17:53:44 +02:00
Xinchen Hui
5aa0856bae Merge branch 'phpng' of git.php.net:php-src into phpng 2014-05-15 22:35:06 +08:00
Xinchen Hui
49df66be01 Made a little clean up 2014-05-15 22:33:13 +08:00
Dmitry Stogov
fba70c8362 check for EG(excepton) 2014-05-15 18:17:49 +04:00
Dmitry Stogov
3610c5cf02 key->len doesn't include trailing space anymore 2014-05-15 17:17:09 +04:00
Dmitry Stogov
40a8156966 Fixed WSDL parsing 2014-05-15 16:21:13 +04:00
nikita2206
b7f6bc5103 add support for pdo-pgsql in phpng refactoring 2014-05-15 16:18:50 +04:00
Dmitry Stogov
3e131b41b2 Fixed memory leaks 2014-05-15 16:18:19 +04:00
Pierre Joye
bb0fb58beb Merge branch 'phpng' of git.php.net:php-src into phpng
# By Dmitry Stogov (1) and Xinchen Hui (1)
# Via Dmitry Stogov
* 'phpng' of git.php.net:php-src:
  Fixed hack. now we may store numbers not as pointers.
  Fixed two tests, 1 left
2014-05-15 12:03:58 +02:00
Dmitry Stogov
f2324a3e0e Merge branch 'phpng' of git.php.net:php-src into phpng
* 'phpng' of git.php.net:php-src:
  Fixed two tests, 1 left
  Refactored ext/xsl, need some help in 3 tests failed
2014-05-15 14:03:44 +04:00
Dmitry Stogov
bc99c0debb Fixed hack. now we may store numbers not as pointers. 2014-05-15 14:00:49 +04:00
Xinchen Hui
a031ced63b Fixed two tests, 1 left 2014-05-15 17:54:58 +08:00
Pierre Joye
17c68b9fd8 Merge branch 'phpng' of git.php.net:php-src into phpng
# By Dmitry Stogov (2) and Xinchen Hui (1)
# Via Dmitry Stogov (2) and Xinchen Hui (1)
* 'phpng' of git.php.net:php-src:
  Fixed zend_string/char* mess
  Refactored ext/xsl, need some help in 3 tests failed
  Fixed SoapFault handling
2014-05-15 11:50:09 +02:00
Xinchen Hui
08663e9107 Merge branch 'phpng' of git.php.net:php-src into phpng 2014-05-15 17:45:35 +08:00
Dmitry Stogov
55b6fb1656 Fixed zend_string/char* mess 2014-05-15 13:44:13 +04:00
Xinchen Hui
d74f5ab3df Refactored ext/xsl, need some help in 3 tests failed 2014-05-15 17:43:44 +08:00
Pierre Joye
5fa4e047b0 unused var 2014-05-15 11:36:40 +02:00
Dmitry Stogov
154976f711 Merge branch 'phpng' of git.php.net:php-src into phpng
* 'phpng' of git.php.net:php-src:
  forgot that hash uses ending 0
  fix ts build
2014-05-15 13:35:03 +04:00
Dmitry Stogov
6f984ab1e8 Fixed SoapFault handling 2014-05-15 13:34:31 +04:00
Pierre Joye
d5e6789439 Merge branch 'phpng' of git.php.net:php-src into phpng
# By Dmitry Stogov
# Via Dmitry Stogov
* 'phpng' of git.php.net:php-src:
  fixed refcounting
  Fixed destructive assignment
2014-05-15 10:56:48 +02:00
Pierre Joye
684506c4c8 fix ts build 2014-05-15 10:36:09 +02:00
Dmitry Stogov
88ba312808 fixed refcounting 2014-05-15 12:34:04 +04:00
Dmitry Stogov
5e7e299a34 Merge branch 'phpng' of git.php.net:php-src into phpng
* 'phpng' of git.php.net:php-src:
  fix leak
  zend_hash_del>zend_hash_str_del
  unused local var
2014-05-15 12:32:15 +04:00
Dmitry Stogov
3d2b175339 Fixed destructive assignment 2014-05-15 12:29:52 +04:00
Pierre Joye
5609bcc757 fix leak 2014-05-15 10:23:50 +02:00
Pierre Joye
e3e192ca98 Merge branch 'phpng' of git.php.net:php-src into phpng
# By Dmitry Stogov
# Via Dmitry Stogov
* 'phpng' of git.php.net:php-src:
  Fixed get_zval_property()
2014-05-15 10:17:11 +02:00
Dmitry Stogov
540070a999 Merge branch 'phpng' of git.php.net:php-src into phpng
* 'phpng' of git.php.net:php-src:
  fix invalid use of STR_FREE > efree
  RETURN_STRING takes the char* only now (always copied)
  RETURN_STRING takes the char* only now
  fix build
2014-05-15 12:14:08 +04:00
Pierre Joye
6e84e4a28e unused local var 2014-05-15 10:12:02 +02:00
Dmitry Stogov
d1c539ce67 Fixed get_zval_property() 2014-05-15 12:11:24 +04:00
Pierre Joye
39f0b585be Merge branch 'phpng' of git.php.net:php-src into phpng
# By Dmitry Stogov
# Via Dmitry Stogov
* 'phpng' of git.php.net:php-src:
  Fixed reference counting and memory leak
  Fixed SOAP error handling
  Array with var_args must not be deallocated any more
  Allow just set or get context passing NULL pointers
  Removed support for old-style resource destructors (only ext/soap used it)
2014-05-15 10:05:04 +02:00
Dmitry Stogov
926388620b Fixed reference counting and memory leak 2014-05-15 11:57:16 +04:00
Pierre Joye
d8c6749649 RETURN_STRING takes the char* only now (always copied) 2014-05-15 09:56:20 +02:00
Pierre Joye
526c778e91 RETURN_STRING takes the char* only now 2014-05-15 09:54:52 +02:00
Dmitry Stogov
4c4df85988 Fixed SOAP error handling 2014-05-15 11:47:10 +04:00
Pierre Joye
6a3ee29785 fix build 2014-05-15 09:38:26 +02:00
Dmitry Stogov
76ada8d5e6 Array with var_args must not be deallocated any more 2014-05-15 11:14:45 +04:00
Dmitry Stogov
04456f8fab Allow just set or get context passing NULL pointers 2014-05-15 11:14:12 +04:00
Dmitry Stogov
281663f75d Removed support for old-style resource destructors (only ext/soap used it) 2014-05-15 10:57:03 +04: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
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
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