Commit Graph

35231 Commits

Author SHA1 Message Date
Pierre Joye
5939345fd5 Merge branch 'phpng' of git.php.net:php-src into phpng
# By Dmitry Stogov (5) and Xinchen Hui (3)
# Via Xinchen Hui (3) and Dmitry Stogov (2)
* 'phpng' of git.php.net:php-src:
  Fixed signed
  Refactoring socket (only compilable now)
  it make no sense to create a reference to object
  Initialize zvals
  Fixed <any> with XML references
  Refactored shmop
  Fixed pointer mess (use * instead of **)
  Fixed support for XML references
2014-05-17 05:42:00 +02:00
Pierre Joye
9b44d687df fix zend_hash_get_current_data_ptr_ex call 2014-05-17 05:41:21 +02:00
Xinchen Hui
84eeae80d8 Merge branch 'phpng' of git.php.net:php-src into phpng 2014-05-17 10:39:05 +08:00
Xinchen Hui
a4a1fc5552 Fixed signed 2014-05-17 10:28:54 +08:00
Xinchen Hui
489da59b08 Refactoring socket (only compilable now) 2014-05-17 10:23:46 +08:00
Dmitry Stogov
fa4b281c56 Merge branch 'phpng' of git.php.net:php-src into phpng
* 'phpng' of git.php.net:php-src:
  Refactored shmop
2014-05-16 20:21:08 +04:00
Dmitry Stogov
fe7d22ddd4 it make no sense to create a reference to object 2014-05-16 20:20:17 +04:00
Dmitry Stogov
e743089d55 Initialize zvals 2014-05-16 19:43:49 +04:00
Dmitry Stogov
e159955d15 Fixed <any> with XML references 2014-05-16 18:11:28 +04:00
Xinchen Hui
bcb4fcd305 Merge branch 'phpng' of git.php.net:php-src into phpng 2014-05-16 22:02:19 +08:00
Xinchen Hui
8b7a3b2d05 Refactored shmop 2014-05-16 22:00:04 +08:00
Dmitry Stogov
89dbe07449 Fixed pointer mess (use * instead of **) 2014-05-16 16:56:36 +04:00
Dmitry Stogov
9d6b5e1f8e Fixed support for XML references 2014-05-16 16:35:00 +04:00
Dmitry Stogov
9df1dcd329 Fixed persistent WSDL cache 2014-05-16 14:36:54 +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
87591db5f5 Restored __destructor() behavior 2014-05-16 13:15:24 +04:00
Tjerk Meesters
d4295eb26a Prevent recursion in ZF2 Parameters class 2014-05-16 16:49:47 +08:00
Dmitry Stogov
9389ce8034 Fixed support for <any> 2014-05-16 12:41:45 +04:00
Pierre Joye
c062b889f8 Merge branch 'phpng' of git.php.net:php-src into phpng
# By Xinchen Hui (3) and Dmitry Stogov (2)
# Via Xinchen Hui (3) and Dmitry Stogov (2)
* 'phpng' of git.php.net:php-src:
  Fixed iterator destruction
  Fixed uninitialized value used
  Finish ext/pdo_pgsql (3 tests fail, 1 due to knew issue, 2 also fails in trunk)
  Fixed memory leaks
  Fixed several test failed
2014-05-16 09:15:55 +02:00
Pierre Joye
3ebd7ec9cf wrong macro usage, we expect a DOM object here 2014-05-16 09:15:30 +02:00
Dmitry Stogov
b258b112a4 Fixed iterator destruction 2014-05-16 11:12:32 +04:00
Xinchen Hui
6859890091 Merge branch 'phpng' of git.php.net:php-src into phpng 2014-05-16 15:09:17 +08:00
Xinchen Hui
4aaab964d7 Fixed uninitialized value used 2014-05-16 14:59:16 +08:00
Dmitry Stogov
3e40a77c9f Merge branch 'phpng' of git.php.net:php-src into phpng
* 'phpng' of git.php.net:php-src:
  Finish ext/pdo_pgsql (3 tests fail, 1 due to knew issue, 2 also fails in trunk)
  Fixed several test failed
2014-05-16 10:41:55 +04:00
Xinchen Hui
97da4ba079 Merge branch 'phpng' of git.php.net:php-src into phpng 2014-05-16 14:40:42 +08:00
Xinchen Hui
e8c2b54b9e Finish ext/pdo_pgsql (3 tests fail, 1 due to knew issue, 2 also fails in trunk) 2014-05-16 14:38:24 +08:00
Dmitry Stogov
98878d4e7d Fixed memory leaks 2014-05-16 10:37:59 +04:00
Pierre Joye
797c1660cb test the right length and remove unused var (remaining from 'old' version) 2014-05-16 08:27:21 +02:00
Xinchen Hui
417860f95d Merge branch 'phpng' of git.php.net:php-src into phpng 2014-05-16 14:20:54 +08:00
Xinchen Hui
34bb45e92d Fixed several test failed 2014-05-16 14:18:11 +08:00
Pierre Joye
f28e0b0db7 fix TS build 2014-05-16 07:34:47 +02:00
Dmitry Stogov
b1f88c9a13 Fixed WSDL attibute parsing 2014-05-16 02:36:52 +04:00
Dmitry Stogov
51c55a1ed3 fixed reference counting and memory leak 2014-05-16 02:04:50 +04:00
Dmitry Stogov
5a9de70ba7 Partial fix for XML references handling 2014-05-16 01:49:04 +04:00
Dmitry Stogov
9b8b55bc16 Fixed handling of compressed SOAP requests 2014-05-16 01:29:40 +04:00
Dmitry Stogov
7cb20d597f Fixed support for SOAP_PERSISTENCE_SESSION 2014-05-15 23:54:36 +04:00
Dmitry Stogov
f31aa8434f Fixed support for empty strings 2014-05-15 23:16:21 +04:00
Dmitry Stogov
f0da988282 Buffer has to be reallocated on each loop iteration 2014-05-15 22:58:58 +04:00
Dmitry Stogov
ce8518e652 Support for IS_INDIRECT 2014-05-15 22:53:01 +04:00
Dmitry Stogov
2709d4f18b Buffer has to be reallocated on each loop iteration 2014-05-15 22:51:46 +04:00
Pierre Joye
a897591180 return ptr, not status 2014-05-15 20:14:29 +02:00
Pierre Joye
8a2a9379cf used only in the #ifdef 0 2014-05-15 20:09:49 +02:00
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
zborboa-google
ec7eccaaae Test 2014-05-14 13:11:51 -07: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
Stanislav Malyshev
3c107d6434 Merge branch 'PHP-5.6'
* PHP-5.6:
  fix bug #67253: timelib_meridian_with_check out-of-bounds read
  Fix bug #67252: convert_uudecode out-of-bounds read
  Fix bug #67251 - date_parse_from_format out-of-bounds read
  Fix bug #67250 (iptcparse out-of-bounds read)
2014-05-13 17:04:44 -07:00
Stanislav Malyshev
292b2fd3b3 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix bug #67253: timelib_meridian_with_check out-of-bounds read
  Fix bug #67252: convert_uudecode out-of-bounds read
  Fix bug #67251 - date_parse_from_format out-of-bounds read
  Fix bug #67250 (iptcparse out-of-bounds read)
2014-05-13 17:03:50 -07:00
Stanislav Malyshev
a03a1ab88c Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fix bug #67253: timelib_meridian_with_check out-of-bounds read
  Fix bug #67252: convert_uudecode out-of-bounds read
  Fix bug #67251 - date_parse_from_format out-of-bounds read
  Fix bug #67250 (iptcparse out-of-bounds read)

Conflicts:
	ext/date/lib/parse_date.c
	ext/date/lib/parse_date.re
2014-05-13 17:02:09 -07:00
Stanislav Malyshev
dc92e81922 Merge branch 'bug67251' into PHP-5.4
* bug67251:
  Fix bug #67251 - date_parse_from_format out-of-bounds read

Conflicts:
	ext/date/lib/parse_date.c
2014-05-13 16:52:45 -07:00
Stanislav Malyshev
0094fd0969 Merge branch 'bug67252' into PHP-5.4
* bug67252:
  fix bug #67253: timelib_meridian_with_check out-of-bounds read
  Fix bug #67252: convert_uudecode out-of-bounds read
2014-05-13 16:47:27 -07:00
Stanislav Malyshev
9103c9eb4f Merge branch 'bug67250' into PHP-5.4
* bug67250:
  Fix bug #67250 (iptcparse out-of-bounds read)
2014-05-13 16:43:10 -07: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
Derick Rethans
7ee66c51e6 Merge branch 'PHP-5.6' 2014-05-13 16:37:07 +01:00
Derick Rethans
db42f83c2e Merge branch 'PHP-5.5' into PHP-5.6 2014-05-13 16:37:05 +01:00
Derick Rethans
e3a48b3a43 Merge branch 'PHP-5.4' into PHP-5.5 2014-05-13 16:36:59 +01:00
Derick Rethans
3e276d6728 - Updated to version 2014.3 (2014c) 2014-05-13 16:36:58 +01: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
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
Pierre Joye
c26d79c854 hash keys now use actual string length without leading zero 2014-05-13 08:11:44 +02: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
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
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
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
9081a1bdfb Refactor ext/gd (all tests passes) 2014-05-12 15:53:35 +08:00
Yasuo Ohgaki
072bbe95ea Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed test for commit 997be125eb
2014-05-12 15:38:40 +09:00
Yasuo Ohgaki
00cacc6048 Fixed test for commit 997be125eb 2014-05-12 15:35:16 +09:00
Stanislav Malyshev
97b203c93f fix test 2014-05-11 23:20:33 -07:00
Stanislav Malyshev
41b655d9cd improve CURL tests to allow testing without separate server 2014-05-11 23:04:09 -07:00
Stanislav Malyshev
89798f57d4 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  improve CURL tests to allow testing without separate server
2014-05-11 23:03:21 -07:00
Stanislav Malyshev
c507c9f01b improve CURL tests to allow testing without separate server 2014-05-11 22:43:08 -07:00
Pierre Joye
7a74d779aa Merge branch 'phpng' of git.php.net:php-src into phpng
# By Xinchen Hui
# Via Xinchen Hui
* 'phpng' of git.php.net:php-src:
  Fixed reference handling
  Fixed IS_INDRICT handling
  Fixed fields handling
  Refactoring wddx (incompleted, is there any one use it? )
  Finish refactoring of MySQLi
  Various bug fixes (now 17 tests fails, it is 11 in trunk)
  Various bug fixed
2014-05-12 06:46:59 +02:00
Yasuo Ohgaki
a33a817f0e Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed bug #67199	mb_regex_encoding mishmash
2014-05-12 13:34:43 +09:00
Yasuo Ohgaki
997be125eb Fixed bug #67199 mb_regex_encoding mishmash 2014-05-12 13:33:53 +09:00
Stanislav Malyshev
466b8aa444 fix bug #67253: timelib_meridian_with_check out-of-bounds read 2014-05-11 21:09:11 -07:00
Xinchen Hui
b2b508a279 Fixed reference handling 2014-05-12 11:39:55 +08:00
Stanislav Malyshev
1e2818b143 Fix bug #67252: convert_uudecode out-of-bounds read 2014-05-11 20:29:27 -07:00
Xinchen Hui
fca5af618f Fixed IS_INDRICT handling 2014-05-12 10:52:37 +08:00
Xinchen Hui
618d6e273c Fixed fields handling 2014-05-12 10:46:19 +08:00
Stanislav Malyshev
0a80849250 Fix bug #67251 - date_parse_from_format out-of-bounds read 2014-05-11 19:34:21 -07:00
Stanislav Malyshev
3e9cb6a4a5 Fix bug #67250 (iptcparse out-of-bounds read) 2014-05-11 19:09:19 -07:00
Stanislav Malyshev
eaa39c9388 Merge branch 'PHP-5.6'
* PHP-5.6:
  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...
2014-05-11 18:57:39 -07:00
Stanislav Malyshev
f2fdeba19d Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  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...
2014-05-11 18:56:32 -07:00
Stanislav Malyshev
af5cc61cf3 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fix bug #67247	spl_fixedarray_resize integer overflow
  fix news
2014-05-11 18:16:19 -07:00
Stanislav Malyshev
291b45afb5 Fix bug #67248 (imageaffinematrixget missing check of parameters) 2014-05-11 18:14:57 -07:00
Stanislav Malyshev
2b475eebbe Fix bug #67247 spl_fixedarray_resize integer overflow 2014-05-11 17:54:27 -07:00
Xinchen Hui
8d87e3b841 Refactoring wddx (incompleted, is there any one use it? ) 2014-05-11 22:04:45 +08:00
Felipe Pena
2ed2283932 Merge branch 'PHP-5.6'
* PHP-5.6:
  - Fixed off-by-one in phar_build (patch by crrodriguez at opensuse dot org)
2014-05-11 09:46:47 -03:00
Felipe Pena
9d8a00337d Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  - Fixed off-by-one in phar_build (patch by crrodriguez at opensuse dot org)
2014-05-11 09:46:38 -03:00
Felipe Pena
b99862e7ae Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  - Fixed off-by-one in phar_build (patch by crrodriguez at opensuse dot org)
2014-05-11 09:46:25 -03:00
Felipe Pena
fb3b8de98d - Fixed off-by-one in phar_build (patch by crrodriguez at opensuse dot org) 2014-05-11 09:45:17 -03:00
Xinchen Hui
c057b3f63d Finish refactoring of MySQLi
a few tests failed due to knew issue, I will disscuss with dmitry later
2014-05-11 19:37:48 +08:00
Xinchen Hui
446c60c616 Various bug fixes (now 17 tests fails, it is 11 in trunk) 2014-05-11 17:02:08 +08:00
Xinchen Hui
53b930475f Various bug fixed 2014-05-11 16:05:14 +08:00
Pierre Joye
486138ef3f Merge branch 'phpng' of git.php.net:php-src into phpng
# By Xinchen Hui (27) and others
# Via Xinchen Hui (5) and others
* 'phpng' of git.php.net:php-src: (47 commits)
  Refactor MySQLi (incompleted, only compilable now)
  Add support for pspell
  update for phpng
  Test push (previous push didn't send mail?)
  Added smart_string to avoid string duplicated
  Use strpprintf
  Added vstrpprintf strpprintf to avoid duplicate string
  Refactor sysvsem, sysvshm, sysmsg
  Fix identical comparison of arrays with references
  Fix strtr() segfault
  Code cleanup in proc_open
  Finish ext/curl (7 tests fails as trunk)
  Fixed post data (long type cast matters here :<)
  Use zend_string for better performance
  Fixed clone refcount
  Fixed build with high version libcurl
  Refactoring ext/curl (only compilable now)
  Fix proc_open resource destruction
  Support for ext/phar (incomplete)
  Finish bz2 (all tests passed)
  ...
2014-05-11 08:55:10 +02:00
Xinchen Hui
2402d6cbbc Refactor MySQLi (incompleted, only compilable now) 2014-05-11 14:53:18 +08:00
Xinchen Hui
e9274de503 Add support for pspell 2014-05-11 00:58:48 +08:00
Felipe Pena
bd88e8dfd2 Merge branch 'PHP-5.6'
* PHP-5.6:
  - Move checking
2014-05-10 11:55:51 -03:00
Felipe Pena
ece7421864 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  - Move checking
2014-05-10 11:55:48 -03:00
Felipe Pena
16b293de50 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  - Move checking
2014-05-10 11:55:45 -03:00
Felipe Pena
c575ab0c88 - Move checking 2014-05-10 11:55:42 -03:00
Felipe Pena
b09529ec1a Merge branch 'PHP-5.6'
* PHP-5.6:
  - Fixed missing NULL check in SimpleXMLElement::xpath()
2014-05-10 11:53:59 -03:00
Felipe Pena
c54b9f7b72 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  - Fixed missing NULL check in SimpleXMLElement::xpath()
2014-05-10 11:53:54 -03:00
Felipe Pena
8bea8cf9cd Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  - Fixed missing NULL check in SimpleXMLElement::xpath()
2014-05-10 11:53:45 -03:00
Felipe Pena
345f6d90d5 - Fixed missing NULL check in SimpleXMLElement::xpath() 2014-05-10 11:53:40 -03:00
Felipe Pena
4308cf30ba Merge branch 'PHP-5.6'
* PHP-5.6:
  - Fixed missing NULL check
2014-05-10 11:40:04 -03:00
Felipe Pena
edbd6c7cc0 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  - Fixed missing NULL check
2014-05-10 11:39:47 -03:00
Felipe Pena
2379ec474e Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  - Fixed missing NULL check
2014-05-10 11:39:28 -03:00
Felipe Pena
5bd443a452 - Fixed missing NULL check 2014-05-10 11:39:08 -03:00
krakjoe
08c4b4736e update for phpng 2014-05-10 10:02:33 +01:00
Xinchen Hui
beb042090d Added smart_string to avoid string duplicated
for now, if we want result a char * use smart_string, if zend_string
 use smart_str
2014-05-10 11:09:17 +08:00
Anatol Belski
7ac7069e99 Merge branch 'PHP-5.6'
* PHP-5.6:
  updated NEWS
  Bug #67238 Ungreedy and min/max quantifier bug in PCRE 8.34 upstream
2014-05-09 22:18:07 +02:00
Anatol Belski
c925c7a5b6 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Bug #67238 Ungreedy and min/max quantifier bug in PCRE 8.34 upstream
2014-05-09 22:16:42 +02:00
Anatol Belski
c62f32c3cc Bug #67238 Ungreedy and min/max quantifier bug in PCRE 8.34 upstream
upstream patch applied
2014-05-09 22:15:54 +02:00
Xinchen Hui
b1c9d5ddee Use strpprintf 2014-05-10 00:43:02 +08:00
Xinchen Hui
e2890e3a0f Refactor sysvsem, sysvshm, sysmsg 2014-05-09 23:28:21 +08:00
Nikita Popov
f1e1231529 Fix strtr() segfault 2014-05-09 15:14:27 +02:00
Nikita Popov
1616415056 Code cleanup in proc_open 2014-05-09 13:01:38 +02:00
Xinchen Hui
1071bf74cf Finish ext/curl (7 tests fails as trunk) 2014-05-09 14:58:07 +08:00
Xinchen Hui
f4c105dc7d Fixed post data (long type cast matters here :<) 2014-05-09 14:48:39 +08:00
Xinchen Hui
763cee63ab Use zend_string for better performance 2014-05-09 14:14:09 +08:00
Xinchen Hui
2d9bc88db8 Fixed clone refcount 2014-05-09 14:00:47 +08:00
Xinchen Hui
564db38dc4 Fixed build with high version libcurl 2014-05-09 13:54:42 +08:00
Xinchen Hui
c5e63f8a63 Refactoring ext/curl (only compilable now) 2014-05-09 12:17:39 +08:00
Nikita Popov
b57d558d56 Fix proc_open resource destruction 2014-05-09 00:24:01 +02:00
Dmitry Stogov
2a31934a1a Support for ext/phar (incomplete) 2014-05-08 21:18:59 +04:00
Xinchen Hui
28bc91d8b4 Merge branch 'phpng' of git.php.net:php-src into phpng 2014-05-08 23:02:53 +08:00
Xinchen Hui
afa1de1883 Finish bz2 (all tests passed) 2014-05-08 22:59:17 +08:00
Dmitry Stogov
df5ad846c6 Support for ext/phar (incomplete) 2014-05-08 18:30:07 +04:00
Xinchen Hui
979c665f21 There is memleak 2014-05-08 22:01:50 +08:00
krakjoe
ebaee948d9 bz2 changes for phpng 2014-05-08 13:14:19 +01:00
krakjoe
29a48fe73b update skeleton 2014-05-08 12:29:56 +01:00
krakjoe
8c7064b2f7 Merge branch 'phpng' of git.php.net:php-src into phpng 2014-05-08 11:58:28 +01:00
krakjoe
f9cfbb8ea1 recode update for phpng 2014-05-08 11:57:35 +01:00
Xinchen Hui
7541f93f97 ext/pdo_mysql/tests/pdo_mysql_attr_oracle_nulls.phpt fails in trunk as well while building with libmysql 2014-05-08 18:34:56 +08:00
Xinchen Hui
28e6a2b452 Revert "ext/pdo_mysql/tests/pdo_mysql_attr_oracle_nulls.phpt fails in trunk as well while building with libmysql"
This reverts commit 29b3529292.
2014-05-08 18:34:40 +08:00
Xinchen Hui
29b3529292 ext/pdo_mysql/tests/pdo_mysql_attr_oracle_nulls.phpt fails in trunk as well while building with libmysql 2014-05-08 18:30:21 +08:00
Stanislav Malyshev
281bde7701 Merge branch 'PHP-5.6'
* PHP-5.6:
  oops, 5.4 and 5.5 use malloc in TSRM
2014-05-08 02:04:50 -07:00
Stanislav Malyshev
a3f09eb323 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  oops, 5.4 and 5.5 use malloc in TSRM
2014-05-08 02:04:11 -07:00
Stanislav Malyshev
cf2b9955d4 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  oops, 5.4 and 5.5 use malloc in TSRM
2014-05-08 02:00:23 -07:00
Stanislav Malyshev
4392339c3e oops, 5.4 and 5.5 use malloc in TSRM 2014-05-08 01:59:39 -07:00
Xinchen Hui
be79628b87 Fixed REFERENCE handling 2014-05-08 16:11:50 +08:00
Stanislav Malyshev
0c709cc2dc Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix memory leak in TSRM
2014-05-08 01:01:15 -07:00
Stanislav Malyshev
a444900c8d Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fix memory leak in TSRM
2014-05-08 01:00:51 -07:00
Stanislav Malyshev
0cc18fdfba Fix memory leak in TSRM 2014-05-08 01:00:34 -07:00
Xinchen Hui
5f46c8fa31 Fixed bugs in pdo_mysql 2014-05-08 15:19:43 +08:00
Xinchen Hui
dfc940c5d9 Revert "Going to refactor mysqlnd"
This reverts commit 37d9f1e6e9.
2014-05-08 11:50:56 +08:00
Dmitry Stogov
fa7008bb24 Fixed resource destruction 2014-05-08 02:48:31 +04:00
Stanislav Malyshev
da4cd8edb0 Fix memory leak in TSRM 2014-05-07 13:28:03 -07:00
Dmitry Stogov
223df9ceea We shouldn't modify strings in-place (it may be interned strings stored in SHN) 2014-05-07 23:19:28 +04:00
Dmitry Stogov
d41d6cf206 Interned strings must not be modified in-place
MAKE_COPY_ZVAL() should be changed into ZVAL_DUP()
2014-05-07 22:08:25 +04:00
Xinchen Hui
37d9f1e6e9 Going to refactor mysqlnd 2014-05-07 23:34:23 +08:00
Daniel Lowrey
b637946a23 Merge branch 'PHP-5.6'
* PHP-5.6:
  Allow crypto_method context value in stream_socket_enable_crypto()
2014-05-07 08:13:31 -06:00
Daniel Lowrey
27f5957e9f Bug #67224: stream_socket_enable_crypto()
- Allow crypto_method context value in stream_socket_enable_crypto()
- As of 5.6.x stream crypto type may be specified in the SSL context,
  making the $crypto_type parameter to stream_socket_enable_crypto()
  optional. This commit checks for a crypto type in the context prior
  to erroring out.
- Update NEWS/UPGRADING
2014-05-07 08:05:29 -06:00
Dmitry Stogov
449ea00a48 Fixed ext/fileinfo conversion mistakes 2014-05-07 17:58:28 +04:00
Dmitry Stogov
e75f2d1f76 Fixed bug introduced during conversion to "phpng" 2014-05-07 16:15:29 +04:00
Dmitry Stogov
b54dcab377 Initialize "retval" 2014-05-07 15:36:01 +04:00
Dmitry Stogov
d5831bfa12 Merge branch 'phpng' of git.php.net:php-src into phpng
* 'phpng' of git.php.net:php-src:
  fix exif, thnx laruence
2014-05-07 15:14:41 +04:00
krakjoe
1f9ecf42b6 Merge branch 'phpng' of git.php.net:php-src into phpng 2014-05-07 12:04:04 +01:00
Dmitry Stogov
0c6a6f0fba Re-applyed Bob's patch with minor fixes 2014-05-07 15:03:56 +04:00
krakjoe
6cab75aaa4 fix exif, thnx laruence 2014-05-07 12:03:00 +01:00
Pierre Joye
670feb3a53 typo in var name 2014-05-07 11:17:03 +02:00
Xinchen Hui
e3a0809655 Rerevert previous commit to phpt by accident 2014-05-07 17:01:59 +08:00
Xinchen Hui
ea26b820e1 Merge branch 'phpng' of git.php.net:php-src into phpng 2014-05-07 16:53:20 +08:00
Xinchen Hui
ed5b6af8af Refactored filter 2014-05-07 16:52:58 +08:00
krakjoe
0a134d1a3a phpng updates for exif 2014-05-07 07:59:45 +01:00
Xinchen Hui
9ef21b7606 Refactor fileinfo 2014-05-07 13:50:29 +08:00
Xinchen Hui
478a8b2ebb Fixed reference handling(param->parameter) 2014-05-07 12:01:07 +08:00
Xinchen Hui
2d0c9690de Refactor pdo_mysql(incompleted, some tests failed due to no mysqlnd) 2014-05-07 11:00:36 +08:00
Dmitry Stogov
4ecc527976 Reverted Bob's patch (it breaks many tests when run with opcache and needs to be fixed first). 2014-05-07 03:26:13 +04:00
Ferenc Kovacs
f63ca453e0 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed test (it requires ext/hash)
2014-05-07 01:00:01 +02:00
Ferenc Kovacs
8e2d396b52 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fixed test (it requires ext/hash)
2014-05-07 00:55:05 +02:00
Dmitry Stogov
8517001b25 Fixed test (it requires ext/hash) 2014-05-07 00:52:49 +02:00
Ferenc Kovacs
0cd679fb17 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed tests (they might fail from time to time because of session GC)
  Fix author name on the #63228 patch.
2014-05-07 00:39:57 +02:00
Ferenc Kovacs
d2f283884f Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed tests (they might fail from time to time because of session GC)
  Fix author name on the #63228 patch.
2014-05-07 00:38:57 +02:00
Ferenc Kovacs
579898e338 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fixed tests (they might fail from time to time because of session GC)
  Fix author name on the #63228 patch.
2014-05-07 00:38:32 +02:00
Dmitry Stogov
f880013c4d Fixed tests (they might fail from time to time because of session GC) 2014-05-07 00:37:56 +02:00
Dmitry Stogov
424aebbf36 Added support for ext/openssl 2014-05-07 01:09:42 +04:00
Martin Jansen
71ad601dee Fix typo 2014-05-06 22:08:52 +02:00
Nikita Popov
a9ba7a6779 Add tests for previous commit 2014-05-06 22:04:58 +02:00
Martin Jansen
c0f4e270a8 This test requires the hash extension. 2014-05-06 21:34:10 +02:00
Nikita Popov
4c5b5d7201 Port ext/gmp (one failure) 2014-05-06 19:03:48 +02:00
Bob Weinand
f3c1881f1d Re-added fix for bug #66015 and adapted for phpng branch 2014-05-06 14:59:03 +02:00
Dmitry Stogov
485a60414d Fixed incorrect boolean IS_FALSE/IS_TRUE handling 2014-05-06 15:59:49 +04:00
Dmitry Stogov
ebe024fd78 Fixed memory leaks 2014-05-06 15:18:17 +04:00
Dmitry Stogov
70a5e0e429 Fixed support for references and proper string lengths 2014-05-06 15:03:25 +04:00
Dmitry Stogov
6f5a0df570 added support for ext/posix 2014-05-06 14:50:54 +04:00
Dmitry Stogov
53b5de1e64 Added support for ext/pcntl (incomplete; ext/posix required to run all tests) 2014-05-06 14:23:56 +04:00
krakjoe
b2fe1c1648 ... 2014-05-06 11:22:15 +01:00
Michael Wallner
333638b0d3 remove useless indirection
the stream was initialized within the ops
in a prior version of the slim_post_data patch
2014-05-06 12:22:08 +02:00
Michael Wallner
5bdfa4d1c6 remove useless indirection
the stream was initialized within the ops
in a prior version of the slim_post_data patch
2014-05-06 12:21:43 +02:00
krakjoe
ff9597a238 Merge branch 'phpng' of git.php.net:php-src into phpng 2014-05-06 11:21:21 +01:00
krakjoe
7f32ffbf89 fix leaks in here 2014-05-06 11:20:54 +01:00
Andrey Hristov
4df71647b6 Merge branch 'PHP-5.6' 2014-05-06 12:17:29 +03:00
Dmitry Stogov
0ea615fd10 Mark all strings stored in SHM as IS_INTERNED to avoid refcounting 2014-05-06 12:41:27 +04:00
Andrey Hristov
1a293e6bd9 rename a constant - old name to new name 2014-05-06 11:36:03 +03:00
krakjoe
4187be99fe fix for phpng, failing RFC2144 test 2014-05-06 09:08:02 +01:00
krakjoe
362e1db428 Merge branch 'phpng' of git.php.net:php-src into phpng 2014-05-06 08:01:26 +01:00
krakjoe
360962ea29 fix ftp for ng 2014-05-06 07:54:54 +01:00
Dmitry Stogov
8915ad69fb Fixed memory leaks 2014-05-06 04:06:58 +04:00
Dmitry Stogov
1606a9a36a PDO code assumes that different parts of the union alligned in special way 2014-05-06 02:02:00 +04:00
Nikita Popov
211d32c814 Initialize CG(one_time_string) in ZTS as well 2014-05-05 22:21:57 +02:00
Nikita Popov
b9438a1ec7 Fix use after free for doc_comment persist 2014-05-05 19:56:05 +02:00
Nikita Popov
592aa37f67 Fix memory error in ext/xml 2014-05-05 17:43:13 +02:00
Nikita Popov
4d22be992c Fix ZTS 2014-05-05 17:28:22 +02:00
Xinchen Hui
a636c4c03f Fixed segfault in _xml_xmlchar_zval 2014-05-05 19:52:42 +08:00
Xinchen Hui
fa6f6c8807 Fixed Reference handling in xml_parse_into_struct 2014-05-05 19:45:50 +08:00
Xinchen Hui
c73c6526ef clean up 2014-05-05 18:09:15 +08:00
Xinchen Hui
39c521c056 Finish Zip (all tests pass) 2014-05-05 17:48:49 +08:00
Xinchen Hui
356824df4c Romove unnecessary proxy macro 2014-05-05 17:44:07 +08:00
Dmitry Stogov
cd4b4dfc4d Merge branch 'master' into refactoring2
Conflicts:
	Zend/zend_hash.c
	ext/date/php_date.c
2014-05-05 13:02:43 +04:00
Xinchen Hui
72f46a34b8 Refactor zlib (all tests pass) 2014-05-05 15:52:09 +08:00
Xinchen Hui
f7ee17d9f7 Refactor gettext 2014-05-05 14:32:32 +08:00
Xinchen Hui
fee9d4cafd Refactor bcmath 2014-05-05 14:26:23 +08:00
Xinchen Hui
7e3989f301 Fixed memory leak in prop_handlers registering 2014-05-05 14:04:52 +08:00
Xinchen Hui
cd00ea9993 Port iconv (all tests passes) 2014-05-05 13:58:23 +08:00
Xinchen Hui
ea33fbd833 Don't use this (keyword) 2014-05-05 10:56:18 +08:00
Xinchen Hui
bea30846bb Refactor Zip (1 test failed) 2014-05-05 10:49:27 +08:00
Xinchen Hui
cf15e94e07 Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2 2014-05-05 10:34:04 +08:00
Nikita Popov
b30c7fe263 Port JSON 2014-05-05 01:00:59 +02:00
Anatol Belski
149568f4da Merge branch 'PHP-5.6'
* PHP-5.6:
  fixed ZEND_DEBUG usage
2014-05-05 00:51:40 +02:00
Anatol Belski
0d5121a3c7 fixed ZEND_DEBUG usage 2014-05-05 00:50:51 +02:00
Anatol Belski
53b4d2feea Merge branch 'PHP-5.6'
* PHP-5.6:
  updated libmagic.patch
2014-05-04 21:34:36 +02:00
Anatol Belski
06ae920165 updated libmagic.patch 2014-05-04 21:34:17 +02:00
Anatol Belski
fe7853137b Merge branch 'PHP-5.6'
* PHP-5.6:
  added missing stdint header, bug #66907
2014-05-04 21:27:37 +02:00
Anatol Belski
031cafd4e2 added missing stdint header, bug #66907 2014-05-04 21:26:53 +02:00
Xinchen Hui
41f6889436 Fixed SimpleXMl build with DOM 2014-05-04 11:46:17 +08:00
Xinchen Hui
f3ccbb3c40 Use self instead of this(keyword) 2014-05-04 11:35:05 +08:00
Xinchen Hui
a275f4c64d Port XMLWriter 2014-05-04 11:33:17 +08:00
Xinchen Hui
4778efc009 Port XMLReader 2014-05-04 11:12:55 +08:00
Nikita Popov
42d4adabbd Fix SXE->string cast for __toString in inheriting class
This issue was originally hacked around in zend_make_printable_zval.
I've now moved the overridden __toString() handling into the SXE
cast_object handler, so everything invoking that handler
(zend_make_printable_zval, convert_to_string, zval_get_string,
and various other more obscure usages) see the same behavior.
2014-05-03 11:29:08 +02:00
Xinchen Hui
d8651fbe1c Make they are in the same style of Z_ISREF 2014-05-03 16:08:58 +08:00
Xinchen Hui
5984f95d8f Refactor XML (incompleted) 2014-05-03 15:58:09 +08:00
Adam Harvey
2f1148ae8a Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix mysqli build when building against libmysqlclient.
2014-05-02 14:34:48 -07:00
Adam Harvey
06a03bbfa6 Fix mysqli build when building against libmysqlclient. 2014-05-02 14:33:52 -07:00