TSRM/configure.ac | 3 0 + 3 - 0 !
configure.ac | 2 0 + 2 - 0 !
2 files changed, 5 deletions(-)

 libtool_fixes

acinclude.m4 | 4 1 + 3 - 0 !
1 file changed, 1 insertion(+), 3 deletions(-)

 static_openssl

configure.ac | 5 4 + 1 - 0 !
php.ini-development | 2 1 + 1 - 0 !
php.ini-production | 2 1 + 1 - 0 !
sapi/cli/php.1.in | 11 6 + 5 - 0 !
scripts/Makefile.frag | 4 2 + 2 - 0 !
scripts/php-config.in | 8 4 + 4 - 0 !
scripts/phpize.in | 4 2 + 2 - 0 !
7 files changed, 20 insertions(+), 16 deletions(-)

 debian_quirks

scripts/phpize.in | 7 5 + 2 - 0 !
1 file changed, 5 insertions(+), 2 deletions(-)

 libtool2.2

build/build2.mk | 3 2 + 1 - 0 !
1 file changed, 2 insertions(+), 1 deletion(-)

 we_want_libtool

ext/standard/info.c | 3 0 + 3 - 0 !
ext/standard/tests/general_functions/phpinfo.phpt | 1 0 + 1 - 0 !
2 files changed, 4 deletions(-)

 php-5.4.9-phpinfo

Drop "Configure Command" from phpinfo as it doesn't
provide any useful information.
The available extensions are not related to this command.

configure.ac | 5 4 + 1 - 0 !
scripts/php-config.in | 4 4 + 0 - 0 !
2 files changed, 8 insertions(+), 1 deletion(-)

 extension_api

sapi/apache2handler/config.m4 | 8 0 + 8 - 0 !
1 file changed, 8 deletions(-)

 no_apache_installed

ext/recode/config9.m4 | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 recode_is_shared

ext/standard/proc_open.c | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 proc_open

php.ini-development | 6 6 + 0 - 0 !
1 file changed, 6 insertions(+)

 php.ini_securitynotes

ext/dba/config.m4 | 52 2 + 50 - 0 !
ext/dba/dba.c | 8 8 + 0 - 0 !
2 files changed, 10 insertions(+), 50 deletions(-)

 php-5.4.7-libdb

ext/date/config0.m4 | 13 13 + 0 - 0 !
ext/date/lib/parse_tz.c | 535 532 + 3 - 0 !
2 files changed, 545 insertions(+), 3 deletions(-)

 add-support-for-use-of-the-system-timezone-database

# License: MIT
# http://opensource.org/licenses/MIT

# License: MIT
# http://opensource.org/licenses/MIT

Add support for use of the system timezone database, rather
than embedding a copy.  Discussed upstream but was not desired.

History:
r18: adapt for autotool change in 7.3.3RC1
r17: adapt for timelib 2018.01 (in 7.3.2RC1)
r16: adapt for timelib 2017.06 (in 7.2.3RC1)
r15: adapt for timelib 2017.05beta7 (in 7.2.0RC1)
r14: improve check for valid tz file
r13: adapt for upstream changes to use PHP allocator
r12: adapt for upstream changes for new zic
r11: use canonical names to avoid more case sensitivity issues
     round lat/long from zone.tab towards zero per builtin db
r10: make timezone case insensitive
r9: fix another compile error without --with-system-tzdata configured (Michael Heimpold)
r8: fix compile error without --with-system-tzdata configured
r7: improve check for valid timezone id to exclude directories
r6: fix fd leak in r5, fix country code/BC flag use in
    timezone_identifiers_list() using system db,
    fix use of PECL timezonedb to override system db,
r5: reverts addition of "System/Localtime" fake tzname.
    updated for 5.3.0, parses zone.tab to pick up mapping between
    timezone name, country code and long/lat coords
r4: added "System/Localtime" tzname which uses /etc/localtime
r3: fix a crash if /usr/share/zoneinfo doesn't exist (Raphael Geissert)
r2: add filesystem trawl to set up name alias index
r1: initial revision

tests/func/null-new_val.phpt | 10 10 + 0 - 0 !
1 file changed, 10 insertions(+)

 strcmp_null-onupdateerrorlog

build/build.mk | 1 0 + 1 - 0 !
1 file changed, 1 deletion(-)

 dont-gitclean-in-build

ext/dba/config.m4 | 4 4 + 0 - 0 !
1 file changed, 4 insertions(+)

 qdbm-is-usr_include_qdbm

ext/session/session.c | 2 1 + 1 - 0 !
php.ini-development | 2 1 + 1 - 0 !
php.ini-production | 2 1 + 1 - 0 !
3 files changed, 3 insertions(+), 3 deletions(-)

 session_save_path

sapi/fpm/php-fpm.8.in | 22 2 + 20 - 0 !
1 file changed, 2 insertions(+), 20 deletions(-)

 php-fpm-man-section-and-cleanup

sapi/fpm/php-fpm.conf.in | 6 3 + 3 - 0 !
1 file changed, 3 insertions(+), 3 deletions(-)

 fpm-config

sapi/fpm/fpm/fpm_conf.c | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 php-fpm-sysconfdir

main/streams/plain_wrapper.c | 8 7 + 1 - 0 !
1 file changed, 7 insertions(+), 1 deletion(-)

 lp564920-fix-big-files

acinclude.m4 | 4 2 + 2 - 0 !
ext/dba/config.m4 | 2 1 + 1 - 0 !
ext/gmp/config.m4 | 2 2 + 0 - 0 !
ext/ldap/config.m4 | 22 10 + 12 - 0 !
ext/pdo_dblib/config.m4 | 2 1 + 1 - 0 !
5 files changed, 16 insertions(+), 16 deletions(-)

 temporary-path-fixes-for-multiarch

sapi/fpm/config.m4 | 5 5 + 0 - 0 !
1 file changed, 5 insertions(+)

 hurd-noptrace

ext/mysqlnd/mysqlnd_connection.c | 2 1 + 1 - 0 !
ext/pdo_mysql/pdo_mysql.c | 2 1 + 1 - 0 !
2 files changed, 2 insertions(+), 2 deletions(-)

 php-5.3.9-mysqlnd

Zend/zend_language_parser.c | 2 2 + 0 - 0 !
configure.ac | 2 2 + 0 - 0 !
ext/interbase/interbase.c | 1 0 + 1 - 0 !
ext/pdo_firebird/firebird_driver.c | 1 0 + 1 - 0 !
ext/standard/file.c | 3 0 + 3 - 0 !
ext/zlib/zlib_fopen_wrapper.c | 2 0 + 2 - 0 !
main/php.h | 1 1 + 0 - 0 !
main/streams/cast.c | 1 0 + 1 - 0 !
main/streams/memory.c | 1 0 + 1 - 0 !
main/streams/streams.c | 1 0 + 1 - 0 !
10 files changed, 5 insertions(+), 10 deletions(-)

 php-5.3.9-gnusrc

ext/dba/dba.c | 2 1 + 1 - 0 !
ext/dba/dba_db3.c | 4 2 + 2 - 0 !
ext/dba/dba_db4.c | 4 2 + 2 - 0 !
3 files changed, 5 insertions(+), 5 deletions(-)

 php-5.3.3-macropen

acinclude.m4 | 2 2 + 0 - 0 !
1 file changed, 2 insertions(+)

 php-5.2.4-norpath

sapi/embed/config.m4 | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 php-5.2.4-embed

sapi/fpm/fpm/fpm_atomic.h | 34 34 + 0 - 0 !
1 file changed, 34 insertions(+)

 php-fpm-m68k

scripts/man1/php-config.1.in | 2 1 + 1 - 0 !
scripts/php-config.in | 5 4 + 1 - 0 !
2 files changed, 5 insertions(+), 2 deletions(-)

 expose_all_built_and_installed_apis

ext/date/php_date.c | 17 17 + 0 - 0 !
1 file changed, 17 insertions(+)

 use system timezone

Upstream don't want this patch. See
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=730771 for a summary.

This delta is recovered from previous versions of the system timezone patch in
Debian, and appears to have inadvertently been dropped. Author unknown.

To be used in tandem with use_embedded_timezonedb.patch and use_embedded_timezonedb_fixes.patch.

ext/zlib/zlib.c | 12 12 + 0 - 0 !
1 file changed, 12 insertions(+)

 zlib-largefile-function-renaming

sapi/fpm/fpm/fpm_events.c | 5 5 + 0 - 0 !
sapi/fpm/fpm/fpm_signals.c | 3 3 + 0 - 0 !
sapi/fpm/php-fpm.8.in | 2 1 + 1 - 0 !
3 files changed, 9 insertions(+), 1 deletion(-)

 php-fpm-do-reload-on-sighup

ext/ldap/config.m4 | 5 4 + 1 - 0 !
1 file changed, 4 insertions(+), 1 deletion(-)

 php-5.4.8-ldap_r

Use -lldap_r by default.

configure.ac | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 php-5.4.9-fixheader

Make generated php_config.h constant across rebuilds.

ext/standard/tests/strings/setlocale_variation2.phpt | 11 8 + 3 - 0 !
1 file changed, 8 insertions(+), 3 deletions(-)

 php-5.6.0-nono

ext/pcre/tests/grep2.phpt | 10 2 + 8 - 0 !
ext/pcre/tests/match_flags3.phpt | 2 1 + 1 - 0 !
2 files changed, 3 insertions(+), 9 deletions(-)

 php-5.6.0-oldpcre

sapi/phpdbg/config.m4 | 4 3 + 1 - 0 !
1 file changed, 3 insertions(+), 1 deletion(-)

 hack-phpdbg-to-explicitly-link-with-libedit

Zend/Zend.m4 | 4 2 + 2 - 0 !
1 file changed, 2 insertions(+), 2 deletions(-)

 fix zend_mm_alignment on m64k

sapi/apache2handler/config.m4 | 15 3 + 12 - 0 !
1 file changed, 3 insertions(+), 12 deletions(-)

 add patch to install php7 module directly to apxs_libexec

sapi/fpm/status.html.in | 5 0 + 5 - 0 !
1 file changed, 5 deletions(-)

 remove w3c validation icon to not expose the reader's ip address to
 potential tracking.

ext/phar/Makefile.frag | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 don't put $(install_root) into phar.phar exec stanza

ext/xmlrpc/config.m4 | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 xmlrpc-epi library has to be linked as -lxmlrpc-epi

configure.ac | 4 2 + 2 - 0 !
1 file changed, 2 insertions(+), 2 deletions(-)

 really expand $libdir/$datadir into @expanded_libdir/datadir@

ext/date/lib/parse_tz.c | 55 41 + 14 - 0 !
1 file changed, 41 insertions(+), 14 deletions(-)

 fix ext/date/lib/parse_tz path_max hurd ftbfs

ext/gd/config.m4 | 30 19 + 11 - 0 !
1 file changed, 19 insertions(+), 11 deletions(-)

 use pkg-config for freetype2 detection

ext/intl/config.m4 | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 amend c++11 for intl compilation on older distributions

acinclude.m4 | 74 6 + 68 - 0 !
aclocal.m4 | 74 6 + 68 - 0 !
2 files changed, 12 insertions(+), 136 deletions(-)

 use pkg-config for php_setup_libxml

NEWS | 4 4 + 0 - 0 !
sapi/fpm/fpm/fpm_unix.c | 36 22 + 14 - 0 !
sapi/fpm/tests/socket-uds-numeric-ugid-nonroot.phpt | 62 62 + 0 - 0 !
sapi/fpm/tests/socket-uds-numeric-ugid.phpt | 58 58 + 0 - 0 !
sapi/fpm/tests/tester.inc | 56 56 + 0 - 0 !
sapi/fpm/www.conf.in | 3 2 + 1 - 0 !
6 files changed, 204 insertions(+), 15 deletions(-)

 allow numeric [ug]id in fpm listen.{owner,group}

sapi/fpm/tests/tester.inc | 12 11 + 1 - 0 !
1 file changed, 11 insertions(+), 1 deletion(-)

 allow fpm tests to be run with long socket path

Socket path is restricted to ~100 bytes, so we can use
the system temp dir if the path ends up too long.

sapi/fpm/tests/bug68391-conf-include-order.phpt | 1 1 + 0 - 0 !
sapi/fpm/tests/proc-user-ignored.phpt | 1 1 + 0 - 0 !
sapi/fpm/tests/socket-uds-numeric-ugid-nonroot.phpt | 1 1 + 0 - 0 !
sapi/fpm/tests/tester.inc | 10 10 + 0 - 0 !
4 files changed, 13 insertions(+)

 skip fpm tests not designed to be run as root

When running as root with TEST_FPM_RUN_AS_ROOT=1

scripts/phpize.in | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 add pkg-config m4 files to phpize script

scripts/phpize.in | 12 10 + 2 - 0 !
1 file changed, 10 insertions(+), 2 deletions(-)

 in phpize, also copy config.guess, config.sub,
 ltmain.sh and shtool from their respective packages

sapi/fpm/fpm/fpm_children.c | 14 7 + 7 - 0 !
sapi/fpm/fpm/fpm_request.c | 4 2 + 2 - 0 !
sapi/fpm/fpm/fpm_scoreboard.c | 106 63 + 43 - 0 !
sapi/fpm/fpm/fpm_scoreboard.h | 11 6 + 5 - 0 !
sapi/fpm/fpm/fpm_status.c | 4 2 + 2 - 0 !
sapi/fpm/fpm/fpm_worker_pool.c | 2 1 + 1 - 0 !
6 files changed, 81 insertions(+), 60 deletions(-)

 fix bug #81026 (php-fpm oob r/w in root process leading to priv
 escalation)

The main change is to store scoreboard procs directly to the variable sized
array rather than indirectly through the pointer.

Signed-off-by: Stanislav Malyshev <stas@php.net>
(cherry picked from commit cb2021e5f69da5e2868130a05bb53db0f9f89e4b)