15 commits

Author	SHA1	Message	Date
Dmitry Stogov	e10e151e9b	Merged zend_array and HashTable into the single data structure. ... Now each HashTable is also zend_array, so it's refcounted and may be a subject for Copy on Write zend_array_dup() was changed to allocate and return HashTable, instead of taking preallocated HashTable as argument.	2015-02-13 22:20:39 +03:00
Xinchen Hui	fc33f52d8c	bump year	2015-01-15 23:27:30 +08:00
Xinchen Hui	2193de0d18	Faster sorting algo	2015-01-14 18:02:41 +08:00
Anatol Belski	bdeb220f48	first shot remove TSRMLS_* things	2014-12-13 23:06:14 +01:00
Anatol Belski	d77ce31763	Merge branch 'PHP-5.6' ... * PHP-5.6: fix output globals importing export output globals use portable strndup implementation unix sockets aren't available on windows dll export APIs needed by phpdbg fix sapi/phpdbg/config.w32 Don't treat warnings as failures in the junit output	2014-10-29 20:04:56 +01:00
Anatol Belski	f842b8f4be	unix sockets aren't available on windows	2014-10-29 19:39:46 +01:00
Remi Collet	770473a648	Merge branch 'PHP-5.6' ... * PHP-5.6: cleanup uneeded json	2014-10-29 07:26:58 +01:00
Remi Collet	7dd871438f	cleanup uneeded json	2014-10-29 07:26:41 +01:00
Bob Weinand	4fec48d1b0	Merge remote-tracking branch 'origin/PHP-5.6'	2014-10-28 23:07:46 +01:00
Bob Weinand	a5415456d4	Merge phpdbg into PHP-5.6	2014-10-28 23:06:50 +01:00
Bob Weinand	66aead4b5f	Merge remote-tracking branch 'origin/PHP-5.6' ... Conflicts: sapi/phpdbg/phpdbg_wait.c sapi/phpdbg/phpdbg_webdata_transfer.c	2014-10-28 23:00:10 +01:00
Bob Weinand	be5d389768	Merge phpdbg into PHP-5.6	2014-10-28 22:44:29 +01:00
Bob Weinand	6150d9342c	Merge ../phpdbg into PHP-5.6 ... Conflicts: sapi/phpdbg/config.m4	2014-10-28 22:15:05 +01:00
Bob Weinand	2bcac53bca	Made phpdbg compatible with new engine	2014-10-24 19:29:50 +02:00
Bob Weinand	9b4d9ac6c7	Merge phpdbg into PHP-5.6	2014-10-24 19:22:45 +02:00