Commit Graph

80811 Commits

Author SHA1 Message Date
Dmitry Stogov
8915ad69fb Fixed memory leaks 2014-05-06 04:06:58 +04:00
Dmitry Stogov
28a8135331 Restored original EG(scope) behavior when call object methods 2014-05-06 02:04:05 +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
Dmitry Stogov
83d45d0a04 GC checks during argument release don't make sense 2014-05-05 12:40:16 +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
Nikita Popov
404cc45ee2 Get php-fpm to work
At least phpinfo() works. Need to do more testing (how do you run
fpm with valgrind?)
2014-05-04 22:10:00 +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
Bob Weinand
f66449a467 Merge branch 'PHP-5.6' 2014-05-03 11:41:33 +02:00
Bob Weinand
003ba74d99 Merge sapi/phpdbg into PHP-5.6 2014-05-03 11:40:25 +02:00
krakjoe
c8d8e851fa /me blushes, really hard 2014-05-03 10:37:11 +01: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
Nikita Popov
65f488ece3 Add STR_ALLOCA_* API, use in get_method and verify_arg
This avoid unnecessary allocations when using dynamic method
dispatch and class typehints.

Probably there are other places where this should be done as well,
those just stood out for my usage.
2014-05-03 10:43:45 +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
Ferenc Kovacs
a6a1785e23 Merge branch 'PHP-5.5'
* PHP-5.5:
  only build and test nts non-debug and ts debug builds as discussed at https://github.com/php/php-src/pull/654
2014-05-03 02:51:46 +02:00
Ferenc Kovacs
c29a72d17f Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  only build and test nts non-debug and ts debug builds as discussed at https://github.com/php/php-src/pull/654
2014-05-03 02:51:02 +02:00
Ferenc Kovacs
58f4bf441a only build and test nts non-debug and ts debug builds as discussed at https://github.com/php/php-src/pull/654 2014-05-03 02:50:37 +02: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
Adam Harvey
62d72d9105 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix author name on the #63228 patch.
2014-05-02 10:26:18 -07:00
Adam Harvey
fbb0c4b800 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix author name on the #63228 patch.
2014-05-02 10:25:42 -07:00
Adam Harvey
d8ff8f6f20 Fix author name on the #63228 patch. 2014-05-02 10:24:09 -07:00
Nikita Popov
46bcaf1b28 Merge branch 'PHP-5.6' 2014-05-02 12:52:44 +02:00