# By Christopher Jones (2) and Xinchen Hui (1)
# Via Xinchen Hui
* 'master' of https://git.php.net/repository/php-src:
Re-fix Bug #65372 (Segfault in gc_zval_possible_root when return reference fails)
PHP 5.5.2 has already branched
Doh. PHP 5.5 NEWS needs own commit.
# 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
...
* PHP-5.5:
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
* 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
* PHP-5.5:
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'
* 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
