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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \|	Merge branch 'PHP-5.4' of ssh://git.php.net/php-src into PHP-5.4	Andrey Hristov	2013-08-08	91	-450/+819
\| \|\ \ \
* \| \ \ \	Merge branch 'PHP-5.4' into PHP-5.5	Andrey Hristov	2013-08-08	0	-0/+0
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Merge branch 'PHP-5.3' into PHP-5.4	Andrey Hristov	2013-08-08	0	-0/+0
\| \|\ \ \ \ \| \| \| \|_\|/ \| \| \|/\| \|
\| \| * \| \|	Merge branch 'PHP-5.3' of https://git.php.net/repository/php-src into PHP-5.3	Christopher Jones	2013-07-22	2	-6/+19
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# By Johannes Schlüter # Via Christopher Jones (1) and Johannes Schlüter (1) * 'PHP-5.3' of https://git.php.net/repository/php-src: Merge PHP 5.3.27 NEWS add test for bug #65236
* \| \| \ \ \	Merge branch 'PHP-5.5' of ssh://git.php.net/php-src into PHP-5.5	Andrey Hristov	2013-08-08	2	-2/+2
\|\ \ \ \ \ \
\| * \ \ \ \ \	Merge branch 'PHP-5.4' into PHP-5.5	Christopher Jones	2013-08-07	2	-2/+2
\| \|\ \ \ \ \ \ \| \| \| \|_\|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.4: Remove tabs on blanklines in Makefile sources. This prevents a 'suspicious line' warning when editing & saving Makefile using Emacs.
\| \| * \| \| \| \|	Remove tabs on blanklines in Makefile sources. This prevents a	Christopher Jones	2013-08-07	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'suspicious line' warning when editing & saving Makefile using Emacs.
\| \| * \| \| \| \|	Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4	Christopher Jones	2013-08-06	2	-0/+5
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# By Xinchen Hui # Via Xinchen Hui * 'PHP-5.4' of https://git.php.net/repository/php-src: Re-fix Bug #65372 (Segfault in gc_zval_possible_root when return reference fails)
* \| \| \| \| \| \| \|	add some tracing	Andrey Hristov	2013-08-08	1	-6/+13
\|/ / / / / / /
* \| \| \| \| \| \|	One more './configure --help' alignment fix	Christopher Jones	2013-08-06	1	-1/+2
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Fix long-standing visual pain point: the misalignment of './configure help' ↵	Christopher Jones	2013-08-06	60	-125/+126
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	text. Whitespace changes and a couple of grammar fixes.
* \| \| \| \| \| \|	Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5	Christopher Jones	2013-08-06	2	-0/+5
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# By Xinchen Hui # Via Xinchen Hui * 'PHP-5.5' of https://git.php.net/repository/php-src: Re-fix Bug #65372 (Segfault in gc_zval_possible_root when return reference fails)
\| * \ \ \ \ \ \	Merge branch 'PHP-5.4' into PHP-5.5	Xinchen Hui	2013-08-06	2	-0/+5
\| \|\ \ \ \ \ \ \ \| \| \| \|/ / / / / \| \| \|/\| \| \| \| \|
\| \| * \| \| \| \| \|	Re-fix Bug #65372 (Segfault in gc_zval_possible_root when return reference ↵	Xinchen Hui	2013-08-06	2	-0/+5
\| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fails) Missed a zval_copy_ctor there
* \| \| \| \| \| \|	Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5	Christopher Jones	2013-08-05	1	-1/+5
\|\ \ \ \ \ \ \ \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 'PHP-5.5' of https://git.php.net/repository/php-src: PHP 5.5.2 has already branched Doh. PHP 5.5 NEWS needs own commit.
\| * \| \| \| \| \|	PHP 5.5.2 has already branched	Christopher Jones	2013-08-05	1	-3/+5
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Doh. PHP 5.5 NEWS needs own commit.	Christopher Jones	2013-08-05	1	-0/+2
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5	Christopher Jones	2013-08-05	123	-301/+740
\|\ \ \ \ \ \ \ \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# By Rasmus Lerdorf (6) and others # Via Christopher Jones (5) and others * 'PHP-5.5' of https://git.php.net/repository/php-src: (26 commits) NEWS for recent DTrace merges. Remove redundant 'cp' during DTrace install. Fixed bug #62691 (solaris sed has no -i switch) Make 'make distclean' remove generated DTrace .h file Enable dtrace probes on linux as they are compatible with systemtap Fixed bug #63706: Cannot build PHP-5.5 with --enable-dtrace on Fedora 17 Add an empty make command for DTrace .d files to stop an implicit circular dependency in GNU Make which causes .d files to be overwritten (Bug 61268) Merge branch 'PHP-5.4' Merge branch 'PHP-5.5' Fixed bug #62978. pg_select()/etc may allow SQL injection when table name is user parameter, users are able to control table names. add news about session fix First fixes for a 64bit compatible ftp extension fix compiler warning, use longs for hashes fix crash, enable session_id and fix test Strict session. Detect session id collision Strict session non living code related typo fixes fix typo This doesn't fail in 5.5 anymore We shouldn't load any local ini files for these tests pcre_quote? No such thing. How did this ever pass? This test needs local infile enabled ...
\| * \| \| \| \| \|	Merge branch 'PHP-5.4' into PHP-5.5	Christopher Jones	2013-08-05	1	-1/+1
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.4: NEWS for recent DTrace merges. Remove redundant 'cp' during DTrace install.
\| \| * \| \| \| \|	NEWS for recent DTrace merges.	Christopher Jones	2013-08-05	2	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove redundant 'cp' during DTrace install.
\| * \| \| \| \| \|	Merge branch 'PHP-5.4' into PHP-5.5	Christopher Jones	2013-08-05	0	-0/+0
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.4: Fixed bug #62691 (solaris sed has no -i switch) Make 'make distclean' remove generated DTrace .h file Enable dtrace probes on linux as they are compatible with systemtap Fixed bug #63706: Cannot build PHP-5.5 with --enable-dtrace on Fedora 17 Conflicts: Makefile.global
\| \| * \| \| \| \|	Fixed bug #62691 (solaris sed has no -i switch)	Christopher Jones	2013-08-05	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make 'make distclean' remove generated DTrace .h file
\| \| * \| \| \| \|	Enable dtrace probes on linux as they are compatible with systemtap	David Soria Parra	2013-08-05	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	You can build php with dtrace probes enabled on linux if you have systemtap with uprobes.
\| \| * \| \| \| \|	Fixed bug #63706: Cannot build PHP-5.5 with --enable-dtrace on Fedora 17	Remi Collet	2013-08-05	1	-2/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'PHP-5.4' into PHP-5.5	Christopher Jones	2013-08-05	1	-0/+4
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.4: Add an empty make command for DTrace .d files to stop an implicit circular dependency in GNU Make which causes .d files to be overwritten (Bug 61268) Merge branch 'PHP-5.4' Conflicts: ext/mysqlnd/mysqlnd.c
\| \| * \| \| \| \|	Add an empty make command for DTrace .d files to stop an implicit	Christopher Jones	2013-08-05	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	circular dependency in GNU Make which causes .d files to be overwritten (Bug 61268)
\| \| * \| \| \| \|	Merge branch 'PHP-5.4'	Kalle Sommer Nielsen	2013-08-05	1	-2/+6
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'PHP-5.5'	Kalle Sommer Nielsen	2013-08-05	1	-2/+6
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'PHP-5.4' into PHP-5.5	Yasuo Ohgaki	2013-08-05	15	-62/+184
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.4: Fixed bug #62978. pg_select()/etc may allow SQL injection when table name is user parameter, users are able to control table names.
\| \| * \| \| \| \|	Fixed bug #62978. pg_select()/etc may allow SQL injection when table name is ↵	Yasuo Ohgaki	2013-08-05	15	-62/+184
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	user parameter, users are able to control table names.
\| * \| \| \| \| \|	add news about session fix	Stanislav Malyshev	2013-08-04	2	-0/+12
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'pr368' into PHP-5.5	Stanislav Malyshev	2013-08-04	39	-95/+264
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* pr368: fix crash, enable session_id and fix test Strict session. Detect session id collision Strict session
\| \| * \| \| \| \| \|	fix crash, enable session_id and fix test	Stanislav Malyshev	2013-08-04	3	-6/+2
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Strict session. Detect session id collision	Yasuo Ohgaki	2013-08-04	2	-2/+28
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Strict session	Yasuo Ohgaki	2013-08-04	38	-93/+240
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'PHP-5.4' into PHP-5.5	Stanislav Malyshev	2013-08-04	6	-57/+107
\| \|\ \ \ \ \ \ \ \| \| \| \|/ / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.4: First fixes for a 64bit compatible ftp extension
\| \| * \| \| \| \| \|	First fixes for a 64bit compatible ftp extension	Andreas Streichardt	2013-08-04	6	-57/+107
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	fix compiler warning, use longs for hashes	Stanislav Malyshev	2013-08-04	1	-1/+1
\| \| \|/ / / / / \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'PHP-5.4' into PHP-5.5	Stanislav Malyshev	2013-08-04	48	-50/+50
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.4: non living code related typo fixes Conflicts: Zend/zend_compile.c
\| \| * \| \| \| \|	non living code related typo fixes	Veres Lajos	2013-08-04	48	-50/+50
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'PHP-5.4' into PHP-5.5	Stanislav Malyshev	2013-08-04	0	-0/+0
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.4: fix typo
\| \| * \| \| \| \|	fix typo	Stanislav Malyshev	2013-08-04	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	This doesn't fail in 5.5 anymore	Rasmus Lerdorf	2013-08-03	1	-2/+0
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge commit 'a03f094' into PHP-5.5	Rasmus Lerdorf	2013-08-02	2	-2/+2
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit 'a03f094': We shouldn't load any local ini files for these tests
\| \| * \| \| \| \|	We shouldn't load any local ini files for these tests	Rasmus Lerdorf	2013-08-02	2	-2/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge commit 'd60e168' into PHP-5.5	Rasmus Lerdorf	2013-08-02	1	-1/+1
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit 'd60e168': pcre_quote? No such thing. How did this ever pass?
\| \| * \| \| \| \|	pcre_quote? No such thing. How did this ever pass?	Rasmus Lerdorf	2013-08-02	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge commit 'ea75b1b' into PHP-5.5	Rasmus Lerdorf	2013-08-02	1	-0/+1
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit 'ea75b1b': This test needs local infile enabled
\| \| * \| \| \| \|	This test needs local infile enabled	Rasmus Lerdorf	2013-08-02	1	-0/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge commit 'e55f08a' into PHP-5.5	Rasmus Lerdorf	2013-08-02	1	-0/+2
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit 'e55f08a': This test will only work if gc is enabled