1
0
mirror of https://github.com/php/php-src.git synced 2026-04-28 18:53:33 +02:00
Commit Graph

34720 Commits

Author SHA1 Message Date
Dmitry Stogov 0ea615fd10 Mark all strings stored in SHM as IS_INTERNED to avoid refcounting 2014-05-06 12:41:27 +04: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
Adam Harvey aacc49191c Merge branch 'PHP-5.6'
* PHP-5.6:
  Use the right path for the suggested PHP invocation in ext_skel.
  Changed to more understandable NEWS message
  one heading is enough
2014-05-01 11:23:48 -07:00
Adam Harvey d5712d6ba4 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Use the right path for the suggested PHP invocation in ext_skel.
2014-05-01 11:23:14 -07:00
Adam Harvey eb46096608 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Use the right path for the suggested PHP invocation in ext_skel.
2014-05-01 11:22:46 -07:00
Adam Harvey 941c39bd06 Use the right path for the suggested PHP invocation in ext_skel.
Fixes bug #67160 (ext_skel outputs incorrect information).
2014-05-01 11:22:20 -07:00
Ferenc Kovacs 562a845dcc Merge branch 'PHP-5.6'
* PHP-5.6:
  XFAIL the leaking multibyte tests, we should really get to the bottom of this
2014-05-01 12:50:28 +02:00
Ferenc Kovacs 95325e5c5d XFAIL the leaking multibyte tests, we should really get to the bottom of this 2014-05-01 12:49:57 +02:00
Dmitry Stogov 17d027ed47 Split IS_BOOL into IS_FALSE and IS_TRUE 2014-04-30 18:32:42 +04:00
Michael Wallner e7e44d7d56 Merge branch 'PHP-5.6'
* PHP-5.6:
  fix test locality inconsitency
2014-04-30 13:03:12 +02:00
Michael Wallner 42fbb952d7 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix test locality inconsitency
2014-04-30 13:02:43 +02:00
Michael Wallner b79301d11f fix test locality inconsitency 2014-04-30 13:01:59 +02:00