Go to file
Xinchen Hui fe1a3fc08b Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  Fixed bug #71841 (EG(error_zval) is not handled well)
  Fixed bug #71840 (Unserialize accepts wrongly data)

Conflicts:
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
	ext/standard/var_unserializer.c
2016-03-17 15:22:44 +08:00
build Merge branch 'PHP-5.6' into PHP-7.0 2016-01-04 18:13:38 +01:00
ext Merge branch 'PHP-5.6' into PHP-7.0 2016-03-17 15:22:44 +08:00
main prepare for 5.6.20RC1 2016-03-17 01:46:00 +01:00
netware Merge branch 'PHP-5.6' into PHP-7.0 2016-01-01 19:48:25 +02:00
pear pear 1.10 was released and the go-pear and install pear phars are now php7 compatible 2015-10-07 13:56:47 +02:00
sapi Fix bug #71624, PHP_MODE_PROCESS_STDIN (CLI SAPI called with '-R') did not properly set $argi and $argn 2016-03-15 07:02:40 +01:00
scripts Merge branch 'PHP-5.6' into PHP-7.0 2016-01-04 18:13:38 +01:00
tests backport 9a07245b72 from 7.0 2016-01-11 20:37:46 +01:00
travis Disable PEAR in Travis build 2015-12-05 22:48:29 +01:00
TSRM Move semicolon into TSRMLS_CACHE_EXTERN/DEFINE 2016-03-03 16:50:01 +01:00
win32 update libs versions 2016-03-15 09:44:05 +01:00
Zend Merge branch 'PHP-5.6' into PHP-7.0 2016-03-17 15:22:44 +08:00
.gdbinit Doubles are not refcounted 2015-09-01 14:52:04 -07:00
.gitattributes
.gitignore Merge branch 'PHP-5.6' into PHP-7.0 2015-12-17 14:30:00 +08:00
.travis.yml remove imap tests for now until I finish the sudoless dovecot config 2015-10-19 23:57:43 +02:00
acinclude.m4 Fixed bug #71006 (symbol referencing errors on Sparc/Solaris) 2015-12-03 13:28:41 +03:00
buildconf
buildconf.bat
CODING_STANDARDS Remove TSRMLS_* from docs as it's not used anymore 2016-02-17 22:36:01 -08:00
config.guess
config.sub
configure.in prepare for 5.6.20RC1 2016-03-17 01:46:00 +01:00
CONTRIBUTING.md Add documentation contribution information. 2015-05-20 19:26:20 -05:00
CREDITS
EXTENSIONS Minor updates to EXTENSIONS for removed SAPIS etc that I remembered off my head, also add Côme as a maintainer for ldap as per request[1]. 2015-06-18 17:22:22 +02:00
footer
genfiles make it possible to set the re2c and yacc paths via environment variables for genfiles 2015-06-11 00:13:08 +02:00
header Merge branch 'PHP-5.6' into PHP-7.0 2016-01-01 19:48:25 +02:00
INSTALL Fix typo in INSTALL 2015-05-12 09:58:08 +02:00
LICENSE Happy new year (Update copyright to 2016) 2016-01-01 19:21:47 +02:00
ltmain.sh
makedist Fixed bug #70917 install-pear-nozlib.phar missing 2015-11-15 19:01:22 +01:00
Makefile.frag
Makefile.gcov exclude datelib from coverage report as asked by Derick 2015-10-24 17:38:20 -04:00
Makefile.global Merge branch 'PHP-5.6' into PHP-7.0 2016-02-08 20:29:24 +02:00
makerpm
NEWS Fixed bug #71841 (EG(error_zval) is not handled well) 2016-03-17 15:16:47 +08:00
php7.spec.in
php.gif
php.ini-development Merge branch 'PHP-5.6' into PHP-7.0 2015-12-24 10:33:41 +01:00
php.ini-production Merge branch 'PHP-5.6' into PHP-7.0 2015-12-24 10:33:41 +01:00
README.EXT_SKEL Remove TSRMLS_* from docs as it's not used anymore 2016-02-17 22:36:01 -08:00
README.GIT-RULES Merge branch 'PHP-5.6' 2015-07-29 10:05:19 +02:00
README.input_filter Remove TSRMLS_* from docs as it's not used anymore 2016-02-17 22:36:01 -08:00
README.MAILINGLIST_RULES
README.md
README.namespaces
README.NEW-OUTPUT-API Remove TSRMLS_* from docs as it's not used anymore 2016-02-17 22:36:01 -08:00
README.PARAMETER_PARSING_API Fix one zpp usage in interbase 2016-03-03 23:50:02 +01:00
README.REDIST.BINS cleanup, ext/json is simple PHP now 2016-02-20 17:42:53 +01:00
README.RELEASE_PROCESS update the doc in regard to the latest discussions 2015-06-25 16:39:02 +02:00
README.SELF-CONTAINED-EXTENSIONS
README.STREAMS Remove TSRMLS_* from docs as it's not used anymore 2016-02-17 22:36:01 -08:00
README.SUBMITTING_PATCH
README.TESTING
README.TESTING2
README.UNIX-BUILD-SYSTEM
README.WIN32-BUILD-SYSTEM
run-tests.php Merge branch 'PHP-5.6' into PHP-7.0 2016-01-04 18:13:38 +01:00
server-tests-config.php
server-tests.php Merge branch 'PHP-5.6' into PHP-7.0 2016-01-04 18:13:38 +01:00
snapshot
stamp-h.in
stub.c
UPGRADING remove older UPGRADING entry, bug #38409 is already fixed in 5.6 2015-12-01 11:32:52 +01:00
UPGRADING.INTERNALS fix format macro names in UPGRADING.INTERNALS 2015-11-11 16:33:34 +01:00
vcsclean

The PHP Interpreter

This is the github mirror of the official PHP repository located at http://git.php.net.

Build Status

Pull Requests

PHP accepts pull requests via github. Discussions are done on github, but depending on the topic can also be relayed to the official PHP developer mailinglist internals@lists.php.net.

New features require an RFC and must be accepted by the developers. See https://wiki.php.net/rfc and https://wiki.php.net/rfc/voting for more information on the process.

Bug fixes do not require an RFC, but require a bugtracker ticket. Always open a ticket at https://bugs.php.net and reference the bug id using #NNNNNN.

Fix #55371: get_magic_quotes_gpc() throws deprecation warning

After removing magic quotes, the get_magic_quotes_gpc function caused
a deprecate warning. get_magic_quotes_gpc can be used to detected
the magic_quotes behavior and therefore should not raise a warning at any
time. The patch removes this warning

We do not merge pull requests directly on github. All PRs will be pulled and pushed through http://git.php.net.

Guidelines for contributors