delta/php-git.git - git.php.net: repository/php-src.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'origin/PHP-5.6' into ↵str_size_and_int64_56_backport	Anatol Belski	2014-08-04	6	-13/+121
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	str_size_and_int64_56_backport * origin/PHP-5.6: backport the fix for bug #67739 Fix bug #67705 (extensive backtracking in rule regular expression) add test Fix bug #67705 (extensive backtracking in rule regular expression)
\| *	Merge branch 'PHP-5.5' into PHP-5.6	Anatol Belski	2014-08-04	1	-0/+8
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.5: backport the fix for bug #67739
\| \| *	Merge branch 'PHP-5.4' into PHP-5.5	Anatol Belski	2014-08-04	1	-0/+8
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.4: backport the fix for bug #67739
\| \| \| *	backport the fix for bug #67739	Anatol Belski	2014-08-04	1	-0/+8
\| \| \| \|
\| * \| \|	Merge branch 'PHP-5.5' into PHP-5.6	Stanislav Malyshev	2014-08-04	0	-0/+0
\| \|\ \ \ \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.5: add test Fix bug #67705 (extensive backtracking in rule regular expression) Conflicts: ext/fileinfo/data_file.c ext/fileinfo/libmagic/softmagic.c ext/fileinfo/magicdata.patch
\| \| * \|	Merge branch 'PHP-5.4' into PHP-5.5	Stanislav Malyshev	2014-08-04	1	-0/+35
\| \| \|\ \ \| \| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.4: add test
\| \| \| *	add test	Stanislav Malyshev	2014-08-04	1	-0/+35
\| \| \| \|
\| \| * \|	Merge branch 'PHP-5.4' into PHP-5.5	Stanislav Malyshev	2014-08-04	4	-21/+76
\| \| \|\ \ \| \| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.4: Fix bug #67705 (extensive backtracking in rule regular expression)
\| \| \| *	Fix bug #67705 (extensive backtracking in rule regular expression)	Stanislav Malyshev	2014-08-04	4	-21/+76
\| \| \| \|
\| * \| \|	Fix bug #67705 (extensive backtracking in rule regular expression)	Stanislav Malyshev	2014-08-04	5	-13/+113
\| \| \| \|
* \| \| \|	fix macro	Anatol Belski	2014-08-04	1	-1/+1
\| \| \| \|
* \| \| \|	Merge remote-tracking branch 'origin/PHP-5.6' into ↵	Anatol Belski	2014-08-04	40	-11708/+12140
\|\ \ \ \ \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	str_size_and_int64_56_backport * origin/PHP-5.6: (46 commits) Fix wrong lenght size Bug #51096 - Remove unnecessary ? for first/last day of Moved streams related functions to xp_ssl.c Remove duplicate NEWS Update NEWS Update NEWS Update NEWS BFN BFN Fixed bug #67715 (php-milter does not build and crashes randomly). We need to turn off any strict mode here for this warning to show up Disable restrictions regarding arrays in constants at run-time. For the discussion around it, see the thread on the mailing list: http://www.mail-archive.com/internals@lists.php.net/msg68245.html Revert "Fix bug #67064 in a BC safe way" Updated NEWS for #67693 Updated NEWS for #67693 Fixed bug #67693 - incorrect push to the empty array add missing entry to NEWS add missing entries to NEWS add NEWS block for the next RC NEWS entry for #67713 ... Conflicts: Zend/zend_language_parser.y ext/odbc/php_odbc.c ext/openssl/openssl.c ext/spl/spl_directory.c ext/spl/spl_iterators.c ext/sqlite3/sqlite3.c ext/standard/array.c
\| * \| \|	Merge branch 'PHP-5.5' into PHP-5.6	Andrey Hristov	2014-07-31	1	-1/+1
\| \|\ \ \ \| \| \|/ /
\| \| * \|	Fix wrong lenght size	Andrey Hristov	2014-07-31	1	-1/+1
\| \| \| \|
\| * \| \|	Merge branch 'PHP-5.5' into PHP-5.6	Peter Cowburn	2014-07-31	2	-11514/+11512
\| \|\ \ \ \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.5: Bug #51096 - Remove unnecessary ? for first/last day of
\| \| * \|	Merge branch 'PHP-5.4' into PHP-5.5	Peter Cowburn	2014-07-31	2	-11514/+11512
\| \| \|\ \ \| \| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.4: Bug #51096 - Remove unnecessary ? for first/last day of Conflicts: ext/date/lib/parse_date.c
\| \| \| *	Merge branch 'pull-request/754' into PHP-5.4	Peter Cowburn	2014-07-31	2	-11514/+11512
\| \| \| \|\
\| \| \| \| *	Bug #51096 - Remove unnecessary ? for first/last day of	Peter Cowburn	2014-07-31	2	-11514/+11512
\| \| \| \|/
\| * \| \|	Moved streams related functions to xp_ssl.c	Tjerk Meesters	2014-07-31	2	-57/+57
\| \| \| \|
\| * \| \|	Remove duplicate NEWS	Keyur Govande	2014-07-30	1	-4/+0
\| \| \| \|
\| * \| \|	Merge branch 'PHP-5.5' into PHP-5.6	Keyur Govande	2014-07-30	0	-0/+0
\| \|\ \ \ \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.5: Update NEWS Update NEWS
\| \| * \|	Merge branch 'PHP-5.4' into PHP-5.5	Keyur Govande	2014-07-30	0	-0/+0
\| \| \|\ \ \| \| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.4: Update NEWS
\| \| \| *	Update NEWS	Keyur Govande	2014-07-30	1	-0/+4
\| \| \| \|
\| \| * \|	Update NEWS	Keyur Govande	2014-07-30	1	-0/+4
\| \| \| \|
\| * \| \|	Update NEWS	Keyur Govande	2014-07-30	1	-0/+4
\| \| \| \|
\| * \| \|	BFN	Michael Wallner	2014-07-30	1	-1/+4
\| \| \| \|
\| * \| \|	Merge branch 'PHP-5.5' into PHP-5.6	Michael Wallner	2014-07-30	3	-6/+10
\| \|\ \ \ \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.5: BFN Fixed bug #67715 (php-milter does not build and crashes randomly).
\| \| * \|	BFN	Michael Wallner	2014-07-30	1	-0/+3
\| \| \| \|
\| \| * \|	Merge branch 'PHP-5.4' into PHP-5.5	Michael Wallner	2014-07-30	3	-6/+10
\| \| \|\ \ \| \| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.4: Fixed bug #67715 (php-milter does not build and crashes randomly).
\| \| \| *	Fixed bug #67715 (php-milter does not build and crashes randomly).	Michael Wallner	2014-07-30	4	-6/+13
\| \| \| \|
\| \| * \|	Merge commit '8b9719d' into PHP-5.5	Rasmus Lerdorf	2014-07-30	1	-0/+3
\| \| \|\ \ \| \| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \|	* commit '8b9719d': We need to turn off any strict mode here for this warning to show up
\| * \| \|	Merge commit '8b9719d' into PHP-5.6	Rasmus Lerdorf	2014-07-30	1	-0/+3
\| \|\ \ \ \| \| \| \|/ \| \| \|/\| \| \| \| \| \| \| \| \|	* commit '8b9719d': We need to turn off any strict mode here for this warning to show up
\| \| * \|	We need to turn off any strict mode here for this warning to show up	Rasmus Lerdorf	2014-07-30	1	-0/+3
\| \| \| \|
\| * \| \|	Disable restrictions regarding arrays in constants at run-time.	Bob Weinand	2014-07-30	8	-32/+65
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	For the discussion around it, see the thread on the mailing list: http://www.mail-archive.com/internals@lists.php.net/msg68245.html
\| * \| \|	Revert "Fix bug #67064 in a BC safe way"	Bob Weinand	2014-07-30	3	-22/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 1a4a9eede59b853f11e8e8b965e5f715f53da8f7. Conflicts: ext/standard/array.c ext/standard/tests/array/bug67064.phpt
\| * \| \|	Merge branch 'PHP-5.5' into PHP-5.6	Tjerk Meesters	2014-07-30	3	-1/+29
\| \|\ \ \ \| \| \| \|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.5: Updated NEWS for #67693 Fixed bug #67693 - incorrect push to the empty array
\| \| * \|	Updated NEWS for #67693	Tjerk Meesters	2014-07-30	1	-0/+3
\| \| \| \|
\| \| * \|	Merge branch 'PHP-5.4' into PHP-5.5	Tjerk Meesters	2014-07-30	2	-1/+26
\| \| \|\ \ \| \| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.4: Updated NEWS for #67693 Fixed bug #67693 - incorrect push to the empty array
\| \| \| *	Updated NEWS for #67693	Tjerk Meesters	2014-07-30	1	-0/+3
\| \| \| \|
\| \| \| *	Fixed bug #67693 - incorrect push to the empty array	Tjerk Meesters	2014-07-30	2	-1/+26
\| \| \| \|
\| * \| \|	add missing entry to NEWS	Ferenc Kovacs	2014-07-30	1	-0/+4
\| \| \| \|
\| * \| \|	add missing entries to NEWS	Ferenc Kovacs	2014-07-30	1	-0/+6
\| \| \| \|
\| * \| \|	add NEWS block for the next RC	Ferenc Kovacs	2014-07-30	1	-1/+3
\| \| \| \|
\| * \| \|	NEWS entry for #67713	Ferenc Kovacs	2014-07-30	1	-0/+4
\| \| \| \|
\| * \| \|	Merge branch 'newInstanceWithoutConstructor' into PHP-5.6	Ferenc Kovacs	2014-07-30	3	-4/+9
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* newInstanceWithoutConstructor: update the exception message to better match the actual check ReflectionClass::newInstanceWithoutConstructor() should be allowed to instantiate every class except those internal classes with a final __construct()
\| \| * \| \|	update the exception message to better match the actual check	Ferenc Kovacs	2014-07-30	3	-3/+3
\| \| \| \| \|
\| \| * \| \|	ReflectionClass::newInstanceWithoutConstructor() should be allowed to ↵	Ferenc Kovacs	2014-07-30	3	-4/+9
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	instantiate every class except those internal classes with a final __construct()
\| * \| \|	Merge branch 'PHP-5.5' into PHP-5.6	Dmitry Stogov	2014-07-30	1	-1/+4
\| \|\ \ \ \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.5: Fixed usage after free
\| \| * \|	Fixed usage after free	Dmitry Stogov	2014-07-30	1	-1/+4
\| \| \| \|
\| * \| \|	Merge branch 'PHP-5.5' into PHP-5.6	Keyur Govande	2014-07-30	5	-26/+121
\| \|\ \ \ \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.5: Undo inadvertent commit of php_version Corrected patch for bug #60616