Go to file
Stanislav Malyshev cd5802e1b3 Merge branch 'PHP-5.6'
* PHP-5.6:
  Bacport fix bug #68741 - Null pointer dereference
  Check that the type is correct

Conflicts:
	ext/standard/incomplete_class.c
2015-03-22 18:33:39 -07:00
build Merge branch 'PHP-5.6' 2015-02-04 09:50:14 +01:00
ext Merge branch 'PHP-5.6' 2015-03-22 18:33:39 -07:00
main Optimize zend_string_realloc() add more specialized versions zend_string_extend() and zend_string_truncate() 2015-03-20 02:02:42 +03:00
netware bump year 2015-01-15 23:27:30 +08:00
pear reverting pear/install-pear-nozlib.phar as this mass php 5 -> php 7 string replace broke the file signature(phar files are binary) 2015-03-20 13:35:07 +01:00
sapi Merge branch 'pull-request/1182' 2015-03-22 15:29:38 -07:00
scripts Merge branch 'PHP-5.6' 2015-01-21 16:26:36 +01:00
tests Fixed error messages 2015-03-20 17:26:12 +03:00
travis Merge branch 'PHP-5.6' 2015-03-20 13:34:55 +01:00
TSRM don't pass zero to malloc() 2015-03-10 09:10:23 +01:00
win32 Merge branch 'PHP-5.5' into PHP-5.6 2015-03-17 13:09:08 -07:00
Zend Allow adding return type during inheritance 2015-03-22 18:56:14 +01:00
.gdbinit Fixed dump_bt and printzv 2015-02-09 22:43:22 +03:00
.gitattributes Remove set_magic_quotes_runtime 2015-01-17 18:26:45 +01:00
.gitignore add a custom built pear installer until we have an official release with php7 compat. see https://github.com/pear/pear-core/pull/33 for the details 2015-01-26 11:14:54 +01:00
.travis.yml Merge branch 'PHP-5.6' 2015-02-05 22:06:27 -08:00
acinclude.m4 Look for PDO include files in the right folder 2015-02-06 12:06:29 +01:00
buildconf
buildconf.bat
CODING_STANDARDS Small Spacing adjustments for better reading 2015-02-07 10:30:07 -06:00
config.guess Update config.guess and config.sub 2014-12-04 17:56:20 +00:00
config.sub Update config.guess and config.sub 2014-12-04 17:56:20 +00:00
configure.in 5.4.40 next 2015-03-17 22:37:16 -07:00
CREDITS
EXTENSIONS JSON is now maintained 2015-02-17 20:44:40 +00:00
footer
genfiles
header Merge branch 'PHP-5.6' 2015-03-01 15:15:03 +08:00
INSTALL typo fixes - https://github.com/vlajos/misspell_fixer 2014-11-23 14:52:47 -08:00
LICENSE Update year 2015-01-17 13:21:20 +08:00
ltmain.sh
makedist
Makefile.frag
Makefile.gcov
Makefile.global
makerpm fix the day of the week 2015-01-29 14:24:20 +08:00
NEWS Merge branch 'PHP-5.5' into PHP-5.6 2015-03-22 18:32:16 -07:00
php7.spec.in
php.gif
php.ini-development removed obsolete php.ini options 2015-02-10 08:48:19 +01:00
php.ini-production removed obsolete php.ini options 2015-02-10 08:48:19 +01:00
README.EXT_SKEL Fix the most obvious issues here. 2015-01-20 23:56:51 -08:00
README.GIT-RULES Formatting fixes for git rules file 2015-01-04 19:24:41 -08:00
README.input_filter
README.MAILINGLIST_RULES
README.md Use svg instead of png to get better image quality 2015-01-25 13:15:41 +08:00
README.namespaces
README.NEW-OUTPUT-API Fix typo php_end_ob_buffer 2015-02-02 18:01:50 +09:00
README.PARAMETER_PARSING_API Fix README.PARAMETER_PARSING_API 2015-01-09 14:52:23 +01:00
README.REDIST.BINS
README.RELEASE_PROCESS Merge branch 'PHP-5.4' into PHP-5.5 2015-01-22 21:28:21 +01:00
README.SELF-CONTAINED-EXTENSIONS
README.STREAMS
README.SUBMITTING_PATCH
README.TESTING Update README.TESTING 2015-02-07 10:35:52 -06:00
README.TESTING2 typo fixes - https://github.com/vlajos/misspell_fixer 2014-11-23 14:52:47 -08:00
README.UNIX-BUILD-SYSTEM
README.WIN32-BUILD-SYSTEM
run-tests.php really only signal reports 2015-01-30 19:52:09 +01:00
server-tests-config.php
server-tests.php Remove set_magic_quotes_runtime 2015-01-17 18:26:45 +01:00
snapshot
stamp-h.in
stub.c
UPGRADING Added note about preg_replace_callback_array in UPGRADING 2015-03-21 15:59:12 +08:00
UPGRADING.INTERNALS TSRMLS_* macros have been removed, user don't have to care about the change anymore 2015-02-06 11:46:38 +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