1
0
mirror of https://github.com/php/php-src.git synced 2026-03-26 09:12:14 +01:00
Dmitry Stogov acfbb7b6dc Merge branch 'master' into test
* master: (67 commits)
  remove the NEWS entry for the reverted fpm fix
  remove the NEWS entry for the reverted fpm fix
  remove the NEWS entry for the reverted fpm fix
  Revert "Fix Bug #67530 	error_log=syslog ignored"
  --enable-fpm for the travis build
  fix the last fpm NEWS entry, the other bug is related, but not the same what we fixed here
  NEWS
  NEWS
  Fix bug #67091: make install fails to install libphp5.so on FreeBSD 10.0
  adding NEWS entry for the fix for bug #65641
  Updated NEWS file for recent phpdbg fixes
  Fixed issue krakjoe/phpdbg#94 - List behavior is inconsistent
  Fix issue krakjoe/phpdbg#97 - list now appends a newline if there is none The prompt should always ensure it is on a newline
  Fixed test
  Inform about back command existence in help - Fixes krakjoe/phpdbg#100 No way to list the current stack/frames
  Fix issue krakjoe/phpdbg#98 break if does not seem to work
  Fix issue krakjoe/phpdbg#99 register function has the same behavior as run
  Fix readline/libedit (Thanks to @remicollet)
  Replace incorrect `E` command with `ev` in watch help
  Fix typo in `finish` help
  ...

Conflicts:
	Zend/zend_ast.c
	Zend/zend_highlight.c
	Zend/zend_indent.c
	ext/spl/spl_array.c
	ext/spl/spl_observer.c
	ext/standard/info.c
2014-07-01 00:19:41 +04:00
2014-06-30 01:34:47 +02:00
2014-07-01 00:19:41 +04:00
2014-06-24 10:17:49 -07:00
2014-01-03 11:08:10 +08:00
2014-07-01 00:19:41 +04:00
2014-06-18 17:50:27 +04:00
2014-02-24 10:13:11 +01:00
2014-06-18 17:50:27 +04:00
2014-07-01 00:19:41 +04:00
2014-05-29 12:47:40 +02:00
2014-06-12 05:07:33 +04:00
2013-07-15 00:18:57 -07:00
2013-02-26 14:35:47 +01:00
2014-06-24 10:17:49 -07:00
2013-05-21 13:27:45 +02:00
2014-06-16 23:27:45 +03:00
2014-06-18 00:11:55 +03:00
2014-01-21 13:25:23 -08:00
2014-04-14 09:34:02 +02:00
2014-04-14 09:34:02 +02:00
2013-10-27 16:40:37 -07:00
2014-06-05 17:45:22 +02:00
2014-06-08 19:27:58 -07:00

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

Description
⚠️ ARCHIVED: Original GitHub repository no longer exists. Preserved as backup on 2026-01-22T16:25:23.756Z
Readme 976 MiB
Languages
C 66%
PHP 31.3%
C++ 0.8%
Shell 0.5%
M4 0.4%
Other 0.8%