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

---

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

---

configure.in | 10 5 + 5 - 0 !
ext/ext_skel | 2 1 + 1 - 0 !
php.ini-development | 2 1 + 1 - 0 !
php.ini-production | 45 1 + 44 - 0 !
sapi/cli/php.1.in | 11 6 + 5 - 0 !
scripts/Makefile.frag | 4 2 + 2 - 0 !
scripts/php-config.in | 6 3 + 3 - 0 !
scripts/phpize.in | 4 2 + 2 - 0 !
8 files changed, 21 insertions(+), 63 deletions(-)

 changes to make php use versioned paths and other minor
 cleanup changes.

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

---

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

 upstream ships an out of date version of libtool.  this ensures that
 we build against an up-to-date version of libtool by running libtoolize
 as part of our build process (this is called indirectly via ./buildconf.sh
 from debian/rules)
 .
 note that we don't touch the libtool.m4 that they ship here, and this file
 gets included in the build process as part of the phpize stuff.  however,
 this is solved in ./debian/rules where it's overwritten with a symlink.

Zend/zend_strtod.c | 27 19 + 8 - 0 !
1 file changed, 19 insertions(+), 8 deletions(-)

---

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

---

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

 adds --phpapi argument to php-config(1)
 .
 TODO: make it more generic and add it to the man page.

sapi/apache/config.m4 | 6 0 + 6 - 0 !
sapi/apache2filter/config.m4 | 8 0 + 8 - 0 !
sapi/apache2handler/config.m4 | 8 0 + 8 - 0 !
sapi/apache_hooks/config.m4 | 6 0 + 6 - 0 !
4 files changed, 28 deletions(-)

 disable installed-apache configure check

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

 turn recode conflicts error message into a warning. the
 recode extension is packaged as a shared library in Debian.

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

---

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

 adds security notices to php.ini settings

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

---

ext/date/lib/parse_tz.c | 535 528 + 7 - 0 !
ext/date/lib/timelib.m4 | 14 14 + 0 - 0 !
2 files changed, 542 insertions(+), 7 deletions(-)

---

ext/mysql/config.m4 | 2 1 + 1 - 0 !
ext/mysqli/config.m4 | 2 1 + 1 - 0 !
ext/pdo_mysql/config.m4 | 2 1 + 1 - 0 !
3 files changed, 3 insertions(+), 3 deletions(-)

 force linking to mysqlclient_r to avoid symbol conflicts.
 apr-util's mysql driver is linked against that version of the library
 but due to missing proper symbols versioning we are forced to link to
 the re-entrant library too.

ext/mssql/php_mssql.c | 32 32 + 0 - 0 !
1 file changed, 32 insertions(+)

---

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

---

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

 don't run git-clean via buildconf
 Calling buildconf indirectly invokes vcsclean, which calls the gitclean-work
 target of build/build.mk, which calls among other things git clean -X -f -d,

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

 look for qdbm under $prefix/include/qdbm too.
 The Debian package ships the header files under that directory, for
 unknown reasons.

ext/date/tests/date_default_timezone_set-1.phpt | 3 0 + 3 - 0 !
1 file changed, 3 deletions(-)

 silence warnings about using the default system timezone info
 In vanilla upstream php, this is considered an error (i.e. the user must
 set the timezone explicitly), though with our use of the system timezonedb
 patch, we actually feel quite comfortable using the default timezone info.
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=571762

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(-)

 set the default session.save_path dir to /var/lib/php5.
 This is the directory that has been used in Debian to store the
 session files and is partially protected by dir permissions.

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

 fix php-fpm's manpage section to match location of binary
 (/usr/sbin,) additionally, remove some stuff that is useless or
 doesn't apply to Debian.

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

 add major version number to paths and allow process pools
 to be configured in individual files in /etc/php5/fpm/pool.d/

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

---

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

 don't mmap large 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 | 2 1 + 1 - 0 !
ext/mssql/config.m4 | 2 1 + 1 - 0 !
ext/mysql/config.m4 | 14 6 + 8 - 0 !
ext/pcre/config0.m4 | 2 1 + 1 - 0 !
ext/pdo_dblib/config.m4 | 2 1 + 1 - 0 !
8 files changed, 15 insertions(+), 15 deletions(-)

 transitional workaround for multiarch
 As a stopgap for natty, patch the various config.m4 files for modules whose
 libraries have moved to the multiarch dir; we can't use --with-libdir yet
 because that requires all the build-deps to have moved.

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

---

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

---

Zend/zend_language_parser.c | 2 2 + 0 - 0 !
configure.in | 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(-)

---

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

---

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

---

sapi/fpm/php-fpm.conf.in | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

---

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

---

Zend/zend.h | 6 3 + 3 - 0 !
1 file changed, 3 insertions(+), 3 deletions(-)

---

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

 add linux/m68k atomic code

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(-)

---

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

 use system timezone
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=730771
Bug-Ubuntu: https://launchpad.net/bugs/1244343

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

---

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(-)

---

ext/odbc/php_odbc.c | 21 14 + 7 - 0 !
1 file changed, 14 insertions(+), 7 deletions(-)

 [patch] fixed bug #63171, script hangs if odbc call during timeout

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

---

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

---

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

---

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

---

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

---

sapi/fpm/fpm/fpm_main.c | 85 84 + 1 - 0 !
1 file changed, 84 insertions(+), 1 deletion(-)

 [patch 1/2] getallheaders for php-fpm #62596

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

 [patch] fix zend_mm_alignment on m64k

ext/standard/tests/file/bug68532.phpt | 25 0 + 25 - 0 !
ext/standard/tests/file/stream_rfc2397_007.phpt | 1 0 + 1 - 0 !
main/streams/memory.c | 20 8 + 12 - 0 !
3 files changed, 8 insertions(+), 38 deletions(-)

---

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

 [patch] fixed #68677

ext/ereg/regex/regcomp.c | 4 4 + 0 - 0 !
ext/pgsql/pgsql.c | 3 3 + 0 - 0 !
2 files changed, 7 insertions(+)

 [patch] fixed bug #68739 #68740 #68741

ext/odbc/php_odbc.c | 9 9 + 0 - 0 !
1 file changed, 9 insertions(+)

 ads_odbc_exec

sapi/apache2handler/sapi_apache2.c | 1 1 + 0 - 0 !
1 file changed, 1 insertion(+)

 php segfault zend_hash_find (php#68486)