Commit Graph

81063 Commits

Author SHA1 Message Date
Dmitry Stogov
bc99c0debb Fixed hack. now we may store numbers not as pointers. 2014-05-15 14:00:49 +04:00
Dmitry Stogov
55b6fb1656 Fixed zend_string/char* mess 2014-05-15 13:44:13 +04: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
6ad1d7d831 forgot that hash uses ending 0 2014-05-15 10:39:35 +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
Pierre Joye
365446763f zend_hash_del>zend_hash_str_del 2014-05-15 10:16:19 +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
Pierre Joye
15a887ca14 fix invalid use of STR_FREE > efree 2014-05-15 10:01:11 +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
Pierre Joye
89a6d2bc53 Merge branch 'phpng' of git.php.net:php-src into phpng
# By Dmitry Stogov
# Via Dmitry Stogov
* 'phpng' of git.php.net:php-src:
  ext/soap support for phpng (incomplete - just compilable)
2014-05-15 08:24:07 +02: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