Go to file
Anatol Belski c6bad96f30 Merge remote-tracking branch 'origin/master' into native-tls
* origin/master: (398 commits)
  NEWS
  add test for bug #68381
  Fixed bug #68381 Set FPM log level earlier during init
  proper dllexport
  move to size_t where zend_string is used internally
  fix some datatype mismatches
  return after the warning, to fix uninitialized salt usage
  fix datatype mismatches
  add missing type specifier
  fix datatype mismatches
  fix unsigned check
  "extern" shouldn't be used for definitions
  joined identical conditional blocks
  simplify fpm tests
  SEND_VAR_NO_REF optimization
  Add test for bug #68442
  Add various tests for FPM - covering recent bugs (68420, 68421, 68423, 68428) - for UDS - for ping and status URI - for multi pool and multi mode
  Include small MIT FastCGI client library from https://github.com/adoy/PHP-FastCGI-Client
  Get rid of zend_free_op structure (use zval* instead). Get rid of useless TSRMLS arguments.
  Add new FPM test for IPv4/IPv6
  ...

Conflicts:
	win32/build/config.w32
2014-11-18 21:18:52 +01:00
build Merge branch 'master' into issue-67910 2014-09-20 10:09:21 +02:00
ext Merge remote-tracking branch 'origin/master' into native-tls 2014-11-18 21:18:52 +01:00
main Merge remote-tracking branch 'origin/master' into native-tls 2014-11-18 21:18:52 +01:00
netware s/PHP 5/PHP 7/ 2014-09-19 18:33:14 +02:00
pear
sapi Merge remote-tracking branch 'origin/master' into native-tls 2014-11-18 21:18:52 +01:00
scripts Merge branch 'master' into issue-67910 2014-09-20 10:09:21 +02:00
tests Fix last commit, and do not output unnecessary information 2014-10-26 22:21:18 +01:00
travis Re-add phpdbg to travis 2014-10-24 19:32:35 +02:00
TSRM Merge remote-tracking branch 'origin/master' into native-tls 2014-11-18 21:18:52 +01:00
win32 Merge remote-tracking branch 'origin/master' into native-tls 2014-11-18 21:18:52 +01:00
Zend Merge remote-tracking branch 'origin/master' into native-tls 2014-11-18 21:18:52 +01:00
.gdbinit Fix incdec of referenced properties 2014-10-12 20:55:52 +02:00
.gitattributes Merge branch 'PHP-5.4' into PHP-5.5 2014-07-21 01:47:19 +03:00
.gitignore Merge branch 'PHP-5.6' 2014-10-02 22:33:10 +02:00
.travis.yml Merge branch 'PHP-5.6' 2014-10-30 18:19:48 +01:00
acinclude.m4 remove some remains from the old patch 2014-09-25 19:27:36 +02:00
buildconf
buildconf.bat
CODING_STANDARDS
config.guess config.guess: add ppc64le / ppcle support by Anton Blanchard <anton@samba.org> 2014-08-28 00:44:31 +03:00
config.sub
configure.in 5.6.4 now 2014-10-28 16:00:19 +01:00
CREDITS
EXTENSIONS Merge branch 'PHP-5.6' 2014-10-08 21:54:05 +04:00
footer
genfiles
header s/PHP 5/PHP 7/ 2014-09-19 18:33:14 +02:00
INSTALL Replaces php5 with php7, without whitespace changes. 2014-09-20 10:01:44 +02:00
LICENSE
ltmain.sh
makedist
Makefile.frag
Makefile.gcov
Makefile.global Replaces php5 with php7, without whitespace changes. 2014-09-20 10:01:44 +02:00
makerpm Replaces php5 with php7, without whitespace changes. 2014-09-20 10:01:44 +02:00
NEWS NEWS 2014-11-18 17:45:50 +01:00
php7.spec.in Replaces php5 with php7, without whitespace changes. 2014-09-20 10:01:44 +02:00
php.gif
php.ini-development Remove <% and <script language="php"> tags 2014-10-05 21:57:05 +02:00
php.ini-production Remove <% and <script language="php"> tags 2014-10-05 21:57:05 +02:00
README.EXT_SKEL
README.GIT-RULES update the GIT-RULES with the 5.6 and the release branches 2014-08-27 00:47:09 +02:00
README.input_filter Replaces php5 with php7, without whitespace changes. 2014-09-20 10:01:44 +02:00
README.MAILINGLIST_RULES
README.md Update README.md 2014-07-17 15:43:24 +01:00
README.namespaces
README.NEW-OUTPUT-API
README.PARAMETER_PARSING_API Merge branch 'master' into issue-67910 2014-09-20 10:09:21 +02:00
README.REDIST.BINS
README.RELEASE_PROCESS
README.SELF-CONTAINED-EXTENSIONS
README.STREAMS
README.SUBMITTING_PATCH Small tidy ups and raise visibility of GitHub PR process 2014-08-07 09:27:53 -07:00
README.TESTING Replaces php5 with php7, without whitespace changes. 2014-09-20 10:01:44 +02:00
README.TESTING2
README.UNIX-BUILD-SYSTEM Replaces php5 with php7, without whitespace changes. 2014-09-20 10:01:44 +02:00
README.WIN32-BUILD-SYSTEM
run-tests.php Don't treat warnings as failures in the junit output 2014-10-29 14:34:58 +01:00
server-tests-config.php typofixes 2014-08-17 15:44:02 +03:00
server-tests.php s/PHP 5/PHP 7/ 2014-09-19 18:33:14 +02:00
snapshot
stamp-h.in
stub.c
UPGRADING Fixed Closure::call() NEWS/UPGRADING 2014-10-25 17:05:52 +01:00
UPGRADING.INTERNALS update UPGRADING.INTERNALS 2014-11-10 14:25:14 +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