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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'PHP-5.4' into PHP-5.5	Andrey Hristov	2013-01-09	1	-1/+1
\|\ \| \| \| \| \| \| \| \|	Conflicts: ext/mysqlnd/mysqlnd.c
\| *	fix compilation error after merge	Andrey Hristov	2013-01-09	1	-1/+1
\| \|
* \|	Merge branch 'PHP-5.4' into PHP-5.5	Andrey Hristov	2013-01-09	1	-0/+2
\|\ \ \| \|/ \| \| \| \| \| \|	Conflicts: ext/mysqlnd/mysqlnd.c
\| *	Merge branch 'PHP-5.3' into PHP-5.4	Andrey Hristov	2013-01-09	1	-0/+2
\| \|\
\| \| *	Use during connect the flags set with set_client_option()	Andrey Hristov	2013-01-09	1	-0/+2
\| \| \|
* \| \|	support for password expiration in mysqlnd, through a flag	Andrey Hristov	2013-01-09	2	-1/+10
\| \| \|
* \| \|	Add new constants	Andrey Hristov	2013-01-09	1	-1/+3
\| \| \|
* \| \|	fix different values of mysqli_stmt_affected_rows between libmysql	Andrey Hristov	2013-01-07	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \|	and mysqlnd (in favor of libmysql) before execute and after prepare()
* \| \|	Merge branch 'PHP-5.4' into PHP-5.5	Xinchen Hui	2013-01-06	37	-37/+37
\|\ \ \ \| \|/ /
\| * \|	bump year	Xinchen Hui	2013-01-06	10	-10/+10
\| \| \|
\| * \|	Merge branch 'PHP-5.3' into PHP-5.4	Xinchen Hui	2013-01-06	27	-27/+27
\| \|\ \ \| \| \|/
\| \| *	bump year	Xinchen Hui	2013-01-06	27	-27/+27
\| \| \|
* \| \|	Merge branch 'PHP-5.4' into PHP-5.5	Andrey Hristov	2012-12-19	1	-42/+95
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \|	Conflicts: ext/mysqlnd/mysqlnd_alloc.c
\| * \|	be cautious about the result of strrchr	Andrey Hristov	2012-12-18	1	-14/+84
\| \| \|
* \| \|	Merge branch 'PHP-5.4' into PHP-5.5	Anatoliy Belsky	2012-12-13	1	-0/+2
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \|	* PHP-5.4: Fixed mysqlnd compilation in debug mode on windows
\| * \|	Fixed mysqlnd compilation in debug mode on windows	Anatoliy Belsky	2012-12-13	1	-0/+2
\| \| \|
* \| \|	Merge branch 'PHP-5.4'	Andrey Hristov	2012-10-31	1	-1/+1
\|\ \ \ \| \|/ /
\| * \|	Merge branch 'PHP-5.3' into PHP-5.4	Andrey Hristov	2012-10-31	1	-1/+1
\| \|\ \ \| \| \|/
\| \| *	read 1 instead of 2 bytes. The next 2 bytes are 2 and thus not a problem	Andrey Hristov	2012-10-31	1	-1/+1
\| \| \|
* \| \|	plug recent leak	Andrey Hristov	2012-10-31	1	-0/+4
\| \| \|
* \| \|	cosmetics	Andrey Hristov	2012-10-31	1	-5/+5
\| \| \|
* \| \|	fix crashes in newly introduced macros when normal trace is disabled but	Andrey Hristov	2012-10-22	1	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \|	memory traced is enabled.
* \| \|	fix newly introduced segfault	Andrey Hristov	2012-10-16	1	-1/+1
\| \| \|
* \| \|	constify	Andrey Hristov	2012-10-12	3	-2/+3
\| \| \|
* \| \|	if ssl has been switched on transmit clear-text password	Andrey Hristov	2012-10-03	4	-24/+36
\| \| \|
* \| \|	fix login failure with empty password. This is 5.5 specific - new code	Andrey Hristov	2012-09-28	1	-2/+2
\| \| \|
* \| \|	compile out example plugin in a release build	andrey	2012-09-26	3	-3/+5
\| \| \|
* \| \|	change public key setting to PERDIR and finish code that allows	andrey	2012-09-25	4	-2/+16
\| \| \| \| \| \| \| \| \| \| \| \|	to set the key file programatically per mysqli_options()
* \| \|	remove old unicode code, that is was compiled out by using a macro	andrey	2012-09-25	14	-669/+80
\| \| \|
* \| \|	Add SHA256 authentication support - password hashing to mysqlnd	andrey	2012-09-25	9	-16/+373
\| \| \| \| \| \| \| \| \| \| \| \|	Automatic switchover to SSL with plain-text password is not part of this
* \| \|	plug a leak when the server ask the client for a auth protocol, that	andrey	2012-08-22	1	-8/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	the client doesn't understand. This is 5.5 specific bug, as a result of a refactoring in 5.5
* \| \|	Fix crashes with filenames that don't contain directory separator - generated	andrey	2012-07-30	1	-14/+40
\| \| \| \| \| \| \| \| \| \| \| \|	files like scanners/parsers.
* \| \|	Merge branch 'PHP-5.4'	Xinchen Hui	2012-07-18	1	-1/+3
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \|	* PHP-5.4: Fixed bug #62594 (segfault in mysqlnd_res_meta::set_mode)
\| * \|	Fixed bug #62594 (segfault in mysqlnd_res_meta::set_mode)	Xinchen Hui	2012-07-18	1	-1/+3
\| \| \|
\| * \|	Merge branch 'PHP-5.4' of ssh://git.php.net/php-src into PHP-5.4	andrey	2012-07-09	1	-2/+2
\| \|\ \
\| * \| \|	fix valgrind warning	andrey	2012-07-09	1	-1/+1
\| \| \| \|
* \| \| \|	fix windows build	Anatoliy Belsky	2012-07-11	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- there should be no trailing white spaces after \ in multiline macros
* \| \| \|	fix valgrind warning	andrey	2012-07-09	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch 'PHP-5.4'	Stanislav Malyshev	2012-06-30	1	-2/+2
\|\ \ \ \ \| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \|	* PHP-5.4: Fixed the common misspelling of the word occurred (occured -> occurred)
\| * \| \|	Fixed the common misspelling of the word occurred (occured -> occurred)	Marc Easen	2012-06-30	1	-2/+2
\| \|/ /
\| * \|	merge	andrey	2012-06-29	1	-1/+1
\| \| \|
\| * \|	Merge branch 'PHP-5.3' into PHP-5.4	andrey	2012-06-29	1	-0/+7
\| \|\ \ \| \| \|/
\| \| *	fix Bug #62273 Segmentation Fault in Mysqli/Mysqlnd	andrey	2012-06-29	1	-0/+7
\| \| \|
* \| \|	merge	andrey	2012-06-29	1	-0/+7
\| \| \|
* \| \|	Merge branch 'PHP-5.4'	andrey	2012-06-29	1	-19/+56
\|\ \ \ \| \|/ /
\| * \|	Merge branch 'PHP-5.3' into PHP-5.4	andrey	2012-06-29	1	-19/+56
\| \|\ \ \| \| \|/
\| \| *	new charsets	andrey	2012-06-29	1	-19/+56
\| \| \|
* \| \|	trace allocations in a file	andrey	2012-06-27	5	-101/+164
\| \| \|
* \| \|	Pass orig filename and line through to emalloc and friends	Johannes Schlüter	2012-06-26	2	-28/+29
\| \| \|
* \| \|	fix windows build	Anatoliy Belsky	2012-06-20	1	-1/+1
\| \| \|