---- php-5.3.1/ext/pcre/config0.m4 2009-11-30 22:09:24.385647500 +0000
-+++ php-5.3.24/ext/pcre/config0.m4 2013-04-17 13:37:52.761509001 +0300
-@@ -11,7 +11,7 @@
+diff -urNp -x '*.orig' php-5.3.29.org/ext/pcre/config0.m4 php-5.3.29/ext/pcre/config0.m4
+--- php-5.3.29.org/ext/pcre/config0.m4 2014-08-13 21:22:50.000000000 +0200
++++ php-5.3.29/ext/pcre/config0.m4 2021-08-22 23:32:13.171860812 +0200
+@@ -11,7 +11,7 @@ PHP_ARG_WITH(pcre-regex,,
if test "$PHP_PCRE_REGEX" != "yes" && test "$PHP_PCRE_REGEX" != "no"; then
AC_MSG_CHECKING([for PCRE headers location])
test -f $i/pcre.h && PCRE_INCDIR=$i
done
-@@ -21,7 +21,7 @@
+@@ -21,7 +21,7 @@ PHP_ARG_WITH(pcre-regex,,
AC_MSG_RESULT([$PCRE_INCDIR])
AC_MSG_CHECKING([for PCRE library location])
test -f $j/libpcre.a || test -f $j/libpcre.$SHLIB_SUFFIX_NAME && PCRE_LIBDIR=$j
done
-@@ -43,12 +43,14 @@
+@@ -43,12 +43,14 @@ PHP_ARG_WITH(pcre-regex,,
AC_MSG_ERROR([The PCRE extension requires PCRE library version >= 6.6])
fi
else
AC_MSG_CHECKING([for PCRE library to use])
AC_MSG_RESULT([bundled])
---- php-5.3.1/ext/pcre/php_pcre.h 2009-11-30 20:59:04.046581246 +0200
-+++ php-5.3.1.pcre/ext/pcre/php_pcre.h 2009-11-30 21:38:06.435493243 +0000
-@@ -34,7 +34,12 @@
- #endif
-
- PHPAPI char *php_pcre_replace(char *regex, int regex_len, char *subject, int subject_len, zval *replace_val, int is_callable_replace, int *result_len, int limit, int *replace_count TSRMLS_DC);
-+#if COMPILE_DL_PCRE
-+#define pcre_get_compiled_regex pcre_get_compiled_regex_p
-+extern PHPAPI pcre* (*pcre_get_compiled_regex)(char *regex, pcre_extra **extra, int *options TSRMLS_DC);
-+#else
- PHPAPI pcre* pcre_get_compiled_regex(char *regex, pcre_extra **extra, int *options TSRMLS_DC);
-+#endif
- PHPAPI pcre* pcre_get_compiled_regex_ex(char *regex, pcre_extra **extra, int *preg_options, int *coptions TSRMLS_DC);
-
- extern zend_module_entry pcre_module_entry;
---- php-5.3.1/ext/pcre/php_pcre.c 2009-11-30 21:10:01.370473754 +0200
-+++ php-5.3.1.pcre/ext/pcre/php_pcre.c 2009-11-30 21:38:01.759684456 +0000
+diff -urNp -x '*.orig' php-5.3.29.org/ext/pcre/php_pcre.c php-5.3.29/ext/pcre/php_pcre.c
+--- php-5.3.29.org/ext/pcre/php_pcre.c 2014-08-13 21:22:50.000000000 +0200
++++ php-5.3.29/ext/pcre/php_pcre.c 2021-08-22 23:32:13.171860812 +0200
@@ -27,6 +27,11 @@
#if HAVE_PCRE || HAVE_BUNDLED_PCRE
#include "ext/standard/php_string.h"
#define PREG_PATTERN_ORDER 1
-@@ -153,6 +158,10 @@
+@@ -153,6 +158,10 @@ static PHP_MINIT_FUNCTION(pcre)
REGISTER_LONG_CONSTANT("PREG_BAD_UTF8_OFFSET_ERROR", PHP_PCRE_BAD_UTF8_OFFSET_ERROR, CONST_CS | CONST_PERSISTENT);
REGISTER_STRING_CONSTANT("PCRE_VERSION", (char *)pcre_version(), CONST_CS | CONST_PERSISTENT);
return SUCCESS;
}
/* }}} */
-@@ -429,6 +438,7 @@
+@@ -444,6 +453,7 @@ PHPAPI pcre_cache_entry* pcre_get_compil
}
/* }}} */
/* {{{ pcre_get_compiled_regex
*/
PHPAPI pcre* pcre_get_compiled_regex(char *regex, pcre_extra **extra, int *preg_options TSRMLS_DC)
---- php-5.3.1/ext/standard/browscap.c 2009-06-06 02:40:49.000000000 +0000
-+++ php-5.3.1.pcre/ext/standard/browscap.c 2009-11-30 21:33:00.775241138 +0000
-@@ -31,6 +31,11 @@
- static zval *current_section;
- static char *current_section_name;
+diff -urNp -x '*.orig' php-5.3.29.org/ext/pcre/php_pcre.h php-5.3.29/ext/pcre/php_pcre.h
+--- php-5.3.29.org/ext/pcre/php_pcre.h 2014-08-13 21:22:50.000000000 +0200
++++ php-5.3.29/ext/pcre/php_pcre.h 2021-08-22 23:32:13.171860812 +0200
+@@ -34,7 +34,12 @@
+ #endif
+
+ PHPAPI char *php_pcre_replace(char *regex, int regex_len, char *subject, int subject_len, zval *replace_val, int is_callable_replace, int *result_len, int limit, int *replace_count TSRMLS_DC);
++#if COMPILE_DL_PCRE
++#define pcre_get_compiled_regex pcre_get_compiled_regex_p
++extern PHPAPI pcre* (*pcre_get_compiled_regex)(char *regex, pcre_extra **extra, int *options TSRMLS_DC);
++#else
+ PHPAPI pcre* pcre_get_compiled_regex(char *regex, pcre_extra **extra, int *options TSRMLS_DC);
++#endif
+ PHPAPI pcre* pcre_get_compiled_regex_ex(char *regex, pcre_extra **extra, int *preg_options, int *coptions TSRMLS_DC);
+
+ extern zend_module_entry pcre_module_entry;
+diff -urNp -x '*.orig' php-5.3.29.org/ext/standard/browscap.c php-5.3.29/ext/standard/browscap.c
+--- php-5.3.29.org/ext/standard/browscap.c 2014-08-13 21:22:50.000000000 +0200
++++ php-5.3.29/ext/standard/browscap.c 2021-08-22 23:32:13.171860812 +0200
+@@ -51,6 +51,11 @@ ZEND_DECLARE_MODULE_GLOBALS(browscap)
+ #define BROWSCAP_G(v) (browscap_globals.v)
+ #endif
+#if COMPILE_DL_PCRE
+// will be visible in here
#define DEFAULT_SECTION_NAME "Default Browser Capability Settings"
/* OBJECTS_FIXME: This whole extension needs going through. The use of objects looks pretty broken here */
---- php-5.3.2/sapi/cli/tests/018.phpt~ 2008-03-17 16:05:39.000000000 +0200
-+++ php-5.3.2/sapi/cli/tests/018.phpt 2010-03-16 20:41:11.341251246 +0200
-@@ -20,8 +20,6 @@
+diff -urNp -x '*.orig' php-5.3.29.org/sapi/cli/tests/018.phpt php-5.3.29/sapi/cli/tests/018.phpt
+--- php-5.3.29.org/sapi/cli/tests/018.phpt 2014-08-13 21:22:50.000000000 +0200
++++ php-5.3.29/sapi/cli/tests/018.phpt 2021-08-22 23:32:13.171860812 +0200
+@@ -20,8 +20,6 @@ echo "Done\n";
--EXPECTF--
[PHP Modules]
%a
---- php-5.2.4/Makefile.global~ 2007-08-31 19:35:54.000000000 +0300
-+++ php-5.2.4/Makefile.global 2007-08-31 19:40:18.287528480 +0300
-@@ -21,6 +21,12 @@
- $(LIBTOOL) --mode=link $(CC) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(phptempdir)/libphp_common.la $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
+diff -urNp -x '*.orig' php-5.3.29.org/Makefile.global php-5.3.29/Makefile.global
+--- php-5.3.29.org/Makefile.global 2021-08-22 23:30:07.428668490 +0200
++++ php-5.3.29/Makefile.global 2021-08-22 23:30:09.435332913 +0200
+@@ -21,6 +21,12 @@ libphp$(PHP_MAJOR_VERSION).la: libphp_co
+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(phptempdir)/libphp_common.la $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
-@$(LIBTOOL) --silent --mode=install cp $@ $(phptempdir)/$@ >/dev/null 2>&1
+$(LIBTOOL_SAPI): libphp_common.la $(PHP_SAPI_OBJS)
fix bug #61930: openssl corrupts ssl key resource when using openssl_get_publickey()
-diff --git a/NEWS b/NEWS
-index 37c1332be3..bedc6a4dcf 100644
---- a/NEWS
-+++ b/NEWS
-@@ -12,6 +12,10 @@ PHP NEWS
- - Mbstring:
- . mb_split() can now handle empty matches like preg_split() does. (Moriyoshi)
-
-+- OpenSSL:
-+ . Fixed bug #61930 (openssl corrupts ssl key resource when using
-+ openssl_get_publickey()). (Stas)
-+
- - SPL:
- . Fixed bug #64228 (RecursiveDirectoryIterator always assumes SKIP_DOTS).
- (patch by kriss@krizalys.com, Laruence)
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index 328c1ee937..d7ac117e51 100644
--- a/ext/openssl/openssl.c
Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4)
-diff --git a/NEWS b/NEWS
-index 9c8e0ec..75aa306 100644
---- a/NEWS
-+++ b/NEWS
-@@ -2,6 +2,10 @@ PHP NEWS
- |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
- ?? ??? 2015 PHP 5.4.40
-
-+- Apache2 Handler SAPI:
-+ . Fixed bug #69218 (potential remote code execution with apache 2.4
-+ apache2handler). (Patrick Schaaf)
-+
- - Fileinfo:
- . Fixed bug #68819 (Fileinfo on specific file causes spurious OOM and/or
- segfault). (Anatol Belski))
diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c
index e97f11c..cfebc5f 100644
--- a/sapi/apache2handler/sapi_apache2.c
-diff -urbB php-5.0.5.org/scripts/Makefile.frag php-5.0.5/scripts/Makefile.frag
---- php-5.0.5.org/scripts/Makefile.frag 2005-09-10 21:29:04.884122000 +0200
-+++ php-5.0.5/scripts/Makefile.frag 2005-09-10 21:30:09.333324848 +0200
+diff -urNp -x '*.orig' php-5.3.29.org/scripts/Makefile.frag php-5.3.29/scripts/Makefile.frag
+--- php-5.3.29.org/scripts/Makefile.frag 2014-08-13 21:22:50.000000000 +0200
++++ php-5.3.29/scripts/Makefile.frag 2021-08-22 23:30:13.908661245 +0200
@@ -4,7 +4,7 @@
#
BUILD_FILES = \
scripts/phpize.m4 \
-diff -urbB php-5.0.5.org/scripts/phpize.in php-5.0.5/scripts/phpize.in
---- php-5.0.5.org/scripts/phpize.in 2005-06-15 19:19:41.000000000 +0200
-+++ php-5.0.5/scripts/phpize.in 2005-09-10 21:51:45.523274024 +0200
+diff -urNp -x '*.orig' php-5.3.29.org/scripts/phpize.in php-5.3.29/scripts/phpize.in
+--- php-5.3.29.org/scripts/phpize.in 2014-08-13 21:22:50.000000000 +0200
++++ php-5.3.29/scripts/phpize.in 2021-08-22 23:30:13.908661245 +0200
@@ -3,7 +3,7 @@
# Variable declaration
prefix='@prefix@'
+phpdir="`eval echo @libdir@`/php/build"
includedir="`eval echo @includedir@`/php"
builddir="`pwd`"
-
+ SED="@SED@"
---- php-5.2.0/scripts/php-config.in 2006-12-14 01:11:33.348180526 +0200
-+++ php-5.2.4/scripts/php-config.in 2007-08-31 19:43:04.061307670 +0300
-@@ -2,6 +2,7 @@
-
+diff -urNp -x '*.orig' php-5.3.29.org/scripts/php-config.in php-5.3.29/scripts/php-config.in
+--- php-5.3.29.org/scripts/php-config.in 2014-08-13 21:22:50.000000000 +0200
++++ php-5.3.29/scripts/php-config.in 2021-08-22 23:30:32.308640660 +0200
+@@ -3,6 +3,7 @@
+ SED="@SED@"
prefix="@prefix@"
exec_prefix="@exec_prefix@"
+sysconfdir='@sysconfdir@'
version="@PHP_VERSION@"
- version_id="@PHP_VERSION_ID@"
- includedir="@includedir@/php"
-@@ -53,6 +54,8 @@
+ vernum="@PHP_VERSION_ID@"
+ include_dir="@includedir@/php"
+@@ -54,6 +55,8 @@ case "$1" in
echo $extension_dir;;
--include-dir)
echo $include_dir;;
--php-binary)
echo $php_binary;;
--php-sapis)
-@@ -72,6 +75,7 @@
+@@ -75,6 +78,7 @@ Options:
--ldflags [$ldflags]
--libs [$libs]
--extension-dir [$extension_dir]
+ --sysconfdir [$sysconfdir]
--include-dir [$include_dir]
+ --man-dir [$man_dir]
--php-binary [$php_binary]
- --php-sapis [$php_sapis]
---- ./sapi/cgi/cgi_main.c~ 2007-08-09 02:51:57.000000000 +0300
-+++ ./sapi/cgi/cgi_main.c 2007-09-05 20:54:19.390089070 +0300
-@@ -558,12 +558,7 @@
+diff -urNp -x '*.orig' php-5.3.29.org/sapi/cgi/cgi_main.c php-5.3.29/sapi/cgi/cgi_main.c
+--- php-5.3.29.org/sapi/cgi/cgi_main.c 2021-08-22 23:30:39.448632666 +0200
++++ php-5.3.29/sapi/cgi/cgi_main.c 2021-08-22 23:30:41.575296952 +0200
+@@ -698,12 +698,7 @@ static void sapi_cgi_log_message(char *m
request = (fcgi_request*) SG(server_context);
- if (request) {
+ if (request) {
int len = strlen(message);
- char *buf = malloc(len+2);
-
echo "end!<br>\n";
?>
---- php5.3-200711090930/sapi/cgi/cgi_main.c 2007-11-01 13:32:38.000000000 +0200
-+++ php5.3-200711090930-graceful/sapi/cgi/cgi_main.c 2007-11-09 13:34:22.974559020 +0200
-@@ -101,6 +101,9 @@
+diff -urNp -x '*.orig' php-5.3.29.org/sapi/cgi/cgi_main.c php-5.3.29/sapi/cgi/cgi_main.c
+--- php-5.3.29.org/sapi/cgi/cgi_main.c 2014-08-13 21:22:50.000000000 +0200
++++ php-5.3.29/sapi/cgi/cgi_main.c 2021-08-22 23:30:36.935302147 +0200
+@@ -106,6 +106,9 @@ static void (*php_php_import_environment
*/
- static int parent = 1;
+ static int children = 0;
+/* Socket we are listening on incoming connections */
+static int fcgi_fd = 0;
+
/**
- * Process group
+ * Set to non-zero if we are the parent process
*/
-@@ -1221,6 +1224,21 @@
- exit(0);
+@@ -1391,6 +1394,21 @@ void fastcgi_cleanup(int signal)
}
+ #endif
+/**
+ * Graceful shutdown. Close listening sockets.
PHP_INI_BEGIN()
STD_PHP_INI_ENTRY("cgi.rfc2616_headers", "0", PHP_INI_ALL, OnUpdateBool, rfc2616_headers, php_cgi_globals_struct, php_cgi_globals)
STD_PHP_INI_ENTRY("cgi.nph", "0", PHP_INI_ALL, OnUpdateBool, nph, php_cgi_globals_struct, php_cgi_globals)
-@@ -1328,7 +1346,6 @@
+@@ -1497,7 +1515,6 @@ int main(int argc, char *argv[])
int requests = 0;
int fastcgi = fcgi_is_fastcgi();
char *bindpath = NULL;
fcgi_request request;
int repeats = 1;
int benchmark = 0;
-@@ -1579,9 +1596,13 @@
+@@ -1776,9 +1793,13 @@ consult the installation file that came
parent = 0;
/* don't catch our signals */
---- php-5.3.3/sapi/fpm/config.m4~ 2010-06-16 11:58:42.000000000 +0300
-+++ php-5.3.3/sapi/fpm/config.m4 2010-07-24 22:32:25.642457281 +0300
-@@ -600,7 +600,7 @@
+diff -urNp -x '*.orig' php-5.3.29.org/sapi/fpm/Makefile.frag php-5.3.29/sapi/fpm/Makefile.frag
+--- php-5.3.29.org/sapi/fpm/Makefile.frag 2021-08-22 23:31:24.021916033 +0200
++++ php-5.3.29/sapi/fpm/Makefile.frag 2021-08-22 23:31:26.618579785 +0200
+@@ -4,7 +4,7 @@ $(builddir)/fpm:
+ @mkdir -p $(builddir)/fpm
+ @mkdir -p $(builddir)/fpm/events
+
+-$(SAPI_FPM_PATH): $(builddir)/fpm $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(SAPI_EXTRA_DEPS)
++$(SAPI_FPM_PATH): $(builddir)/fpm libphp_common.la $(PHP_SAPI_OBJS) $(SAPI_EXTRA_DEPS)
+ $(BUILD_FPM)
+
+ $(builddir)/fpm/fpm_conf.lo: $(builddir)/../../main/build-defs.h
+diff -urNp -x '*.orig' php-5.3.29.org/sapi/fpm/config.m4 php-5.3.29/sapi/fpm/config.m4
+--- php-5.3.29.org/sapi/fpm/config.m4 2021-08-22 23:31:24.021916033 +0200
++++ php-5.3.29/sapi/fpm/config.m4 2021-08-22 23:31:26.618579785 +0200
+@@ -637,7 +637,7 @@ if test "$PHP_FPM" != "no"; then
BUILD_FPM="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_SAPI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(SAPI_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)"
;;
*)
;;
esac
---- php-5.3.3/sapi/fpm/Makefile.frag~ 2010-05-30 01:00:43.000000000 +0300
-+++ php-5.3.3/sapi/fpm/Makefile.frag 2010-07-24 22:33:51.945781258 +0300
-@@ -3,7 +3,7 @@
- $(builddir)/fpm:
- @mkdir -p $(builddir)/fpm
-
--$(SAPI_FPM_PATH): $(builddir)/fpm $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(SAPI_EXTRA_DEPS)
-+$(SAPI_FPM_PATH): $(builddir)/fpm libphp_common.la $(PHP_SAPI_OBJS) $(SAPI_EXTRA_DEPS)
- $(BUILD_FPM)
-
- $(builddir)/fpm/fpm_conf.lo: $(builddir)/../../main/build-defs.h
-diff -ur php-5.3.0.org/configure.in php-5.3.0/configure.in
---- php-5.3.0.org/configure.in 2009-06-26 17:44:18.000000000 +0200
-+++ php-5.3.0/configure.in 2009-08-18 12:45:19.126841759 +0200
+diff -urNp -x '*.orig' php-5.3.29.org/configure.in php-5.3.29/configure.in
+--- php-5.3.29.org/configure.in 2021-08-22 23:31:57.338545281 +0200
++++ php-5.3.29/configure.in 2021-08-22 23:31:59.505209512 +0200
@@ -1,7 +1,7 @@
## $Id$ -*- autoconf -*-
dnl ## Process this file with autoconf to produce a configure script.
dnl ## Diversion 1 is the autoconf + automake setup phase. We also
dnl ## set the PHP version, deal with platform-specific compile
-@@ -308,7 +308,7 @@
+@@ -290,7 +290,7 @@ sinclude(TSRM/threads.m4)
sinclude(TSRM/tsrm.m4)
dnl ## Diversion 2 is where we set PHP-specific options and come up
dnl ## with reasonable default values for them. We check for pthreads here
-@@ -347,7 +347,7 @@
+@@ -329,7 +329,7 @@ if test "$enable_maintainer_zts" = "yes"
PTHREADS_FLAGS
fi
dnl ## In diversion 3 we check for compile-time options to the PHP
dnl ## core and how to deal with different system dependencies.
-@@ -702,7 +702,7 @@
+@@ -682,7 +682,7 @@ if test "x$php_crypt_r" = "x1"; then
PHP_CRYPT_R_STYLE
fi
dnl ## In diversion 4 we check user-configurable general settings.
-@@ -943,7 +943,7 @@
+@@ -923,7 +923,7 @@ else
AC_MSG_RESULT([using system default])
fi
dnl ## In diversion 5 we check which extensions should be compiled.
dnl ## All of these are normally in the extension directories.
-diff -ur php-5.3.0.org/ext/standard/config.m4 php-5.3.0/ext/standard/config.m4
---- php-5.3.0.org/ext/standard/config.m4 2009-01-12 00:37:16.000000000 +0100
-+++ php-5.3.0/ext/standard/config.m4 2009-08-18 12:45:19.130174674 +0200
+diff -urNp -x '*.orig' php-5.3.29.org/ext/standard/config.m4 php-5.3.29/ext/standard/config.m4
+--- php-5.3.29.org/ext/standard/config.m4 2014-08-13 21:22:50.000000000 +0200
++++ php-5.3.29/ext/standard/config.m4 2021-08-22 23:31:59.505209512 +0200
@@ -1,6 +1,6 @@
dnl $Id$ -*- autoconf -*-
dnl
dnl Check if flush should be called explicitly after buffered io
-@@ -220,7 +220,7 @@
- AC_CHECK_FUNCS(getcwd getwd asinh acosh atanh log1p hypot glob strfmon nice fpclass isinf isnan)
+@@ -342,7 +342,7 @@ dnl
+ AC_CHECK_FUNCS(getcwd getwd asinh acosh atanh log1p hypot glob strfmon nice fpclass isinf isnan mempcpy strpncpy)
AC_FUNC_FNMATCH
-divert(5)dnl
dnl
dnl Check if there is a support means of creating a new process
-diff -ur php-5.3.0.org/scripts/phpize.m4 php-5.3.0/scripts/phpize.m4
---- php-5.3.0.org/scripts/phpize.m4 2009-06-02 21:54:03.000000000 +0200
-+++ php-5.3.0/scripts/phpize.m4 2009-08-18 12:45:19.126841759 +0200
+diff -urNp -x '*.orig' php-5.3.29.org/scripts/phpize.m4 php-5.3.29/scripts/phpize.m4
+--- php-5.3.29.org/scripts/phpize.m4 2014-08-13 21:22:50.000000000 +0200
++++ php-5.3.29/scripts/phpize.m4 2021-08-22 23:31:59.505209512 +0200
@@ -1,6 +1,6 @@
dnl This file becomes configure.in for self-contained extensions.
---- php-5.2.0/ext/standard/mail.c 2006-12-01 14:20:27.881416250 +0100
-+++ php-5.2.4/ext/standard/mail.c 2007-08-31 19:25:50.777713042 +0300
+diff -urNp -x '*.orig' php-5.3.29.org/ext/standard/mail.c php-5.3.29/ext/standard/mail.c
+--- php-5.3.29.org/ext/standard/mail.c 2014-08-13 21:22:50.000000000 +0200
++++ php-5.3.29/ext/standard/mail.c 2021-08-22 23:28:48.858756113 +0200
@@ -21,6 +21,8 @@
#include <stdlib.h>
#include <ctype.h>
+#include <string.h>
#include "php.h"
#include "ext/standard/info.h"
-
-@@ -35,6 +37,8 @@
- #include "php_ini.h"
+ #include "ext/standard/php_string.h"
+@@ -44,6 +46,8 @@
+ #include "php_string.h"
#include "safe_mode.h"
#include "exec.h"
+#include "zend_operators.h"
#ifdef PHP_WIN32
#include "win32/sendmail.h"
-@@ -107,6 +111,18 @@
- return;
+@@ -129,6 +133,18 @@ PHP_FUNCTION(mail)
+ MAIL_ASCIIZ_CHECK(extra_cmd, extra_cmd_len);
}
+ /* search for To: and Subject: headers which should be specified in proper mail() parameters, not in additional headers */
if (to_len > 0) {
to_r = estrndup(to, to_len);
for (; to_len; to_len--) {
-@@ -231,8 +247,42 @@
- return 0;
+@@ -315,8 +331,42 @@ PHPAPI int php_mail(char *to, char *subj
+ MAIL_RET(0);
}
#endif
- fprintf(sendmail, "To: %s\n", to);
---- php-5.3.26/ext/mysql/php_mysql.c~ 2013-06-10 11:24:49.710731868 +0000
-+++ php-5.3.26/ext/mysql/php_mysql.c 2013-06-10 11:27:25.811562208 +0000
-@@ -360,6 +360,7 @@
- PHP_INI_ENTRY("mysql.default_port", NULL, PHP_INI_ALL, OnMySQLPort)
+diff -urNp -x '*.orig' php-5.3.29.org/ext/mysql/php_mysql.c php-5.3.29/ext/mysql/php_mysql.c
+--- php-5.3.29.org/ext/mysql/php_mysql.c 2014-08-13 21:22:50.000000000 +0200
++++ php-5.3.29/ext/mysql/php_mysql.c 2021-08-22 23:30:55.478614710 +0200
+@@ -506,6 +506,7 @@ PHP_INI_BEGIN()
STD_PHP_INI_ENTRY("mysql.default_socket", NULL, PHP_INI_ALL, OnUpdateStringUnempty, default_socket, zend_mysql_globals, mysql_globals)
+ #endif
STD_PHP_INI_ENTRY("mysql.connect_timeout", "60", PHP_INI_ALL, OnUpdateLong, connect_timeout, zend_mysql_globals, mysql_globals)
+ STD_PHP_INI_ENTRY("mysql.connect_charset", NULL, PHP_INI_ALL, OnUpdateString, connect_charset, zend_mysql_globals, mysql_globals)
STD_PHP_INI_BOOLEAN("mysql.trace_mode", "0", PHP_INI_ALL, OnUpdateLong, trace_mode, zend_mysql_globals, mysql_globals)
+ STD_PHP_INI_BOOLEAN("mysql.allow_local_infile", "1", PHP_INI_SYSTEM, OnUpdateLong, allow_local_infile, zend_mysql_globals, mysql_globals)
PHP_INI_END()
- /* }}} */
-@@ -376,6 +377,7 @@
+@@ -523,6 +524,7 @@ static PHP_GINIT_FUNCTION(mysql)
mysql_globals->connect_errno = 0;
mysql_globals->connect_error = NULL;
mysql_globals->connect_timeout = 0;
+ mysql_globals->connect_charset = NULL;
mysql_globals->trace_mode = 0;
+ mysql_globals->allow_local_infile = 1;
mysql_globals->result_allocated = 0;
- }
-@@ -693,6 +693,7 @@
+@@ -691,6 +693,7 @@ static void php_mysql_do_connect(INTERNA
{
char *user=NULL, *passwd=NULL, *host_and_port=NULL, *socket=NULL, *tmp=NULL, *host=NULL;
int user_len = 0, passwd_len = 0, host_len = 0;
char *hashed_details=NULL;
int hashed_details_length, port = MYSQL_PORT;
long client_flags = 0;
-@@ -527,6 +530,7 @@
-
+@@ -710,6 +713,7 @@ static void php_mysql_do_connect(INTERNA
+ #endif
connect_timeout = MySG(connect_timeout);
+ connect_charset = MySG(connect_charset);
socket = MySG(default_socket);
---- php-5.3.1/ext/mysql/php_mysql.c~ 2010-02-20 00:51:52.000000000 +0200
-+++ php-5.3.1/ext/mysql/php_mysql.c 2010-02-20 00:55:43.475653264 +0200
-@@ -777,6 +777,10 @@
+@@ -849,6 +853,10 @@ static void php_mysql_do_connect(INTERNA
if (connect_timeout != -1) {
mysql_options(mysql->conn, MYSQL_OPT_CONNECT_TIMEOUT, (const char *)&connect_timeout);
}
#ifndef MYSQL_USE_MYSQLND
if (mysql_real_connect(mysql->conn, host, user, passwd, NULL, port, socket, client_flags)==NULL)
#else
-@@ -826,6 +830,8 @@
- #endif
+@@ -897,6 +905,8 @@ static void php_mysql_do_connect(INTERNA
+ #endif
if (mysql_ping(mysql->conn)) {
if (mysql_errno(mysql->conn) == 2006) {
+ if (connect_charset != NULL)
#ifndef MYSQL_USE_MYSQLND
if (mysql_real_connect(mysql->conn, host, user, passwd, NULL, port, socket, client_flags)==NULL)
#else
-@@ -898,6 +904,9 @@
- if (connect_timeout != -1)
- mysql_options(mysql->conn, MYSQL_OPT_CONNECT_TIMEOUT, (const char *)&connect_timeout);
+@@ -976,6 +986,9 @@ static void php_mysql_do_connect(INTERNA
+ mysql_options(mysql->conn, MYSQL_OPT_CONNECT_TIMEOUT, (const char *)&connect_timeout);
+ }
+ if (connect_charset != NULL)
+ mysql_options(mysql->conn, MYSQL_SET_CHARSET_NAME, connect_charset);
+
#ifndef MYSQL_USE_MYSQLND
- if (mysql_real_connect(mysql->conn, host, user, passwd, NULL, port, socket, client_flags)==NULL)
+ if (mysql_real_connect(mysql->conn, host, user, passwd, NULL, port, socket, client_flags)==NULL)
#else
---- php-5.2.5_p20080206.orig/ext/mysql/php_mysql_structs.h 2008-02-06 14:22:57.510605687 +0100
-+++ php-5.2.5_p20080206/ext/mysql/php_mysql_structs.h 2008-02-06 14:23:27.764590355 +0100
-@@ -103,6 +103,7 @@
+diff -urNp -x '*.orig' php-5.3.29.org/ext/mysql/php_mysql_structs.h php-5.3.29/ext/mysql/php_mysql_structs.h
+--- php-5.3.29.org/ext/mysql/php_mysql_structs.h 2014-08-13 21:22:50.000000000 +0200
++++ php-5.3.29/ext/mysql/php_mysql_structs.h 2021-08-22 23:30:55.478614710 +0200
+@@ -118,6 +118,7 @@ ZEND_BEGIN_MODULE_GLOBALS(mysql)
long default_port;
char *default_host, *default_user, *default_password;
char *default_socket;
---- php-5.3.1/ext/mysqli/mysqli.c~ 2010-02-20 00:58:34.000000000 +0200
-+++ php-5.3.1/ext/mysqli/mysqli.c 2010-02-20 01:00:22.459111311 +0200
-@@ -602,6 +602,7 @@
+diff -urNp -x '*.orig' php-5.3.29.org/ext/mysqli/mysqli.c php-5.3.29/ext/mysqli/mysqli.c
+--- php-5.3.29.org/ext/mysqli/mysqli.c 2014-08-13 21:22:50.000000000 +0200
++++ php-5.3.29/ext/mysqli/mysqli.c 2021-08-22 23:31:00.665275563 +0200
+@@ -543,6 +543,7 @@ PHP_INI_BEGIN()
#else
STD_PHP_INI_ENTRY("mysqli.default_socket", NULL, PHP_INI_ALL, OnUpdateStringUnempty, default_socket, zend_mysqli_globals, mysqli_globals)
#endif
+ STD_PHP_INI_ENTRY("mysqli.connect_charset", NULL, PHP_INI_ALL, OnUpdateString, connect_charset, zend_mysqli_globals, mysqli_globals)
STD_PHP_INI_BOOLEAN("mysqli.reconnect", "0", PHP_INI_SYSTEM, OnUpdateLong, reconnect, zend_mysqli_globals, mysqli_globals)
STD_PHP_INI_BOOLEAN("mysqli.allow_local_infile", "1", PHP_INI_SYSTEM, OnUpdateLong, allow_local_infile, zend_mysqli_globals, mysqli_globals)
- #ifdef MYSQLI_USE_MYSQLND
-@@ -475,6 +476,7 @@
+ PHP_INI_END()
+@@ -564,6 +565,7 @@ static PHP_GINIT_FUNCTION(mysqli)
mysqli_globals->default_user = NULL;
mysqli_globals->default_pw = NULL;
mysqli_globals->default_socket = NULL;
mysqli_globals->reconnect = 0;
mysqli_globals->report_mode = 0;
mysqli_globals->report_ht = 0;
---- php-5.3.4/ext/mysqli/mysqli_nonapi.c~ 2010-12-12 23:07:03.000000000 +0200
-+++ php-5.3.4/ext/mysqli/mysqli_nonapi.c 2010-12-12 23:07:36.497424912 +0200
-@@ -61,7 +61,7 @@
+diff -urNp -x '*.orig' php-5.3.29.org/ext/mysqli/mysqli_nonapi.c php-5.3.29/ext/mysqli/mysqli_nonapi.c
+--- php-5.3.29.org/ext/mysqli/mysqli_nonapi.c 2014-08-13 21:22:50.000000000 +0200
++++ php-5.3.29/ext/mysqli/mysqli_nonapi.c 2021-08-22 23:31:00.668608893 +0200
+@@ -61,7 +61,7 @@ void mysqli_common_connect(INTERNAL_FUNC
MY_MYSQL *mysql = NULL;
MYSQLI_RESOURCE *mysqli_resource = NULL;
zval *object = getThis();
int hostname_len = 0, username_len = 0, passwd_len = 0, dbname_len = 0, socket_len = 0;
zend_bool persistent = FALSE;
long port = 0, flags = 0;
-@@ -241,6 +241,12 @@
+@@ -232,6 +232,12 @@ void mysqli_common_connect(INTERNAL_FUNC
}
#endif
+ }
+
#if !defined(MYSQLI_USE_MYSQLND)
- if (mysql_real_connect(mysql->mysql, hostname, username, passwd, dbname, port, socket, CLIENT_MULTI_RESULTS) == NULL)
- #else
---- php-5.3.1/ext/mysqli/php_mysqli_structs.h~ 2009-10-14 16:51:25.000000000 +0300
-+++ php-5.3.1/ext/mysqli/php_mysqli_structs.h 2010-02-20 01:04:56.512214846 +0200
-@@ -358,6 +358,7 @@
+ /* BC for prior to bug fix #53425 */
+ flags |= CLIENT_MULTI_RESULTS;
+diff -urNp -x '*.orig' php-5.3.29.org/ext/mysqli/php_mysqli_structs.h php-5.3.29/ext/mysqli/php_mysqli_structs.h
+--- php-5.3.29.org/ext/mysqli/php_mysqli_structs.h 2014-08-13 21:22:50.000000000 +0200
++++ php-5.3.29/ext/mysqli/php_mysqli_structs.h 2021-08-22 23:31:00.668608893 +0200
+@@ -291,6 +291,7 @@ ZEND_BEGIN_MODULE_GLOBALS(mysqli)
char *default_user;
char *default_socket;
char *default_pw;
enabled only if mysqlnd driver is enabled which makes the contexts really
small.
---- php-5.3.1/ext/pdo_mysql/mysql_driver.c~ 2010-02-20 01:08:04.000000000 +0200
-+++ php-5.3.1/ext/pdo_mysql/mysql_driver.c 2010-02-20 01:08:52.982186037 +0200
-@@ -436,6 +436,7 @@
+diff -urNp -x '*.orig' php-5.3.29.org/ext/pdo_mysql/mysql_driver.c php-5.3.29/ext/pdo_mysql/mysql_driver.c
+--- php-5.3.29.org/ext/pdo_mysql/mysql_driver.c 2014-08-13 21:22:50.000000000 +0200
++++ php-5.3.29/ext/pdo_mysql/mysql_driver.c 2021-08-22 23:31:05.181937166 +0200
+@@ -566,6 +566,7 @@ static int pdo_mysql_handle_factory(pdo_
pdo_mysql_db_handle *H;
int i, ret = 0;
char *host = NULL, *unix_socket = NULL;
unsigned int port = 3306;
char *dbname;
struct pdo_data_src_parser vars[] = {
-@@ -731,6 +731,12 @@
+@@ -768,6 +769,12 @@ static int pdo_mysql_handle_factory(pdo_
password_len = strlen(dbh->password);
}
+ }
+
if (mysqlnd_connect(H->server, host, dbh->username, dbh->password, password_len, dbname, dbname_len,
- port, unix_socket, connect_opts, PDO_MYSQL_G(mysqlnd_thd_zval_cache) TSRMLS_CC) == NULL) {
+ port, unix_socket, connect_opts TSRMLS_CC) == NULL) {
#else
---- php-5.3.3/ext/pdo_mysql/pdo_mysql.c~ 2010-07-24 19:23:14.000000000 +0300
-+++ php-5.3.3/ext/pdo_mysql/pdo_mysql.c 2010-07-24 19:24:48.363581841 +0300
-@@ -56,6 +56,7 @@
+diff -urNp -x '*.orig' php-5.3.29.org/ext/pdo_mysql/pdo_mysql.c php-5.3.29/ext/pdo_mysql/pdo_mysql.c
+--- php-5.3.29.org/ext/pdo_mysql/pdo_mysql.c 2014-08-13 21:22:50.000000000 +0200
++++ php-5.3.29/ext/pdo_mysql/pdo_mysql.c 2021-08-22 23:31:05.181937166 +0200
+@@ -66,6 +66,7 @@ PHP_INI_BEGIN()
#if PDO_DBG_ENABLED
STD_PHP_INI_ENTRY("pdo_mysql.debug", NULL, PHP_INI_SYSTEM, OnUpdateString, debug, zend_pdo_mysql_globals, pdo_mysql_globals)
#endif
PHP_INI_END()
/* }}} */
-@@ -89,9 +90,7 @@
+@@ -103,9 +104,7 @@ static PHP_MINIT_FUNCTION(pdo_mysql)
static PHP_MSHUTDOWN_FUNCTION(pdo_mysql)
{
php_pdo_unregister_driver(&pdo_mysql_driver);
return SUCCESS;
}
-@@ -161,6 +161,7 @@
+@@ -175,6 +174,7 @@ static PHP_GINIT_FUNCTION(pdo_mysql)
pdo_mysql_globals->debug = NULL; /* The actual string */
pdo_mysql_globals->dbg = NULL; /* The DBG object*/
#endif
}
/* }}} */
---- php-5.3.2RC3/ext/pdo_mysql/php_pdo_mysql_int.h~ 2010-02-04 11:37:38.000000000 +0200
-+++ php-5.3.2RC3/ext/pdo_mysql/php_pdo_mysql_int.h 2010-02-26 19:11:47.484055898 +0200
-@@ -69,6 +69,7 @@
+diff -urNp -x '*.orig' php-5.3.29.org/ext/pdo_mysql/php_pdo_mysql_int.h php-5.3.29/ext/pdo_mysql/php_pdo_mysql_int.h
+--- php-5.3.29.org/ext/pdo_mysql/php_pdo_mysql_int.h 2014-08-13 21:22:50.000000000 +0200
++++ php-5.3.29/ext/pdo_mysql/php_pdo_mysql_int.h 2021-08-22 23:31:05.181937166 +0200
+@@ -72,6 +72,7 @@ ZEND_BEGIN_MODULE_GLOBALS(pdo_mysql)
char *debug; /* The actual string */
MYSQLND_DEBUG *dbg; /* The DBG object */
#endif
---- php-4.3.3RC3/ext/standard/info.c.orig 2003-06-19 18:43:41.000000000 +0200
-+++ php-4.3.3RC3/ext/standard/info.c 2003-08-16 21:37:18.705836072 +0200
-@@ -518,6 +518,21 @@
- PUTS(!sapi_module.phpinfo_as_text?"<br />":"\n");
- PUTS(zend_version);
+diff -urNp -x '*.orig' php-5.3.29.org/ext/standard/info.c php-5.3.29/ext/standard/info.c
+--- php-5.3.29.org/ext/standard/info.c 2014-08-13 21:22:50.000000000 +0200
++++ php-5.3.29/ext/standard/info.c 2021-08-22 23:28:44.608760840 +0200
+@@ -897,6 +897,21 @@ PHPAPI void php_print_info(int flag TSRM
+ zend_html_puts(zend_version, strlen(zend_version) TSRMLS_CC);
+ }
php_info_print_box_end();
+ /* PLD Linux */
+ php_info_print_box_start(0);
efree(php_uname);
}
-diff -urN php-4.2.1RC2.org/ext/standard/info.h php-4.2.1RC2/ext/standard/info.h
---- php-4.2.1RC2.org/ext/standard/info.h Sat May 11 20:49:24 2002
-+++ php-4.2.1RC2/ext/standard/info.h Sat May 11 20:49:40 2002
+diff -urNp -x '*.orig' php-5.3.29.org/ext/standard/info.h php-5.3.29/ext/standard/info.h
+--- php-5.3.29.org/ext/standard/info.h 2014-08-13 21:22:50.000000000 +0200
++++ php-5.3.29/ext/standard/info.h 2021-08-22 23:28:44.608760840 +0200
@@ -54,6 +54,7 @@
#define PHP_EGG_LOGO_GUID "PHPE9568F36-D428-11d2-A769-00AA001ACF42"
#define ZEND_LOGO_GUID "PHPE9568F35-D428-11d2-A769-00AA001ACF42"
#define PHP_CREDITS_GUID "PHPB8B5F2A0-3C92-11d3-A3A9-4C7B08C10000"
+#define PLD_LOGO_GUID "PHPE9568F40-D428-11d2-A769-00AA001ACF42"
+ BEGIN_EXTERN_C()
PHP_FUNCTION(phpversion);
- PHP_FUNCTION(phpinfo);
---- php-4.3.0.org/main/logos.h Sat May 11 20:49:24 2002
-+++ php-4.3.0/main/logos.h Sat May 11 20:50:32 2002
-@@ -1503,1 +1503,127 @@
- 249, 249, 207, 233, 5, 4, 0, 59 };
+diff -urNp -x '*.orig' php-5.3.29.org/main/logos.h php-5.3.29/main/logos.h
+--- php-5.3.29.org/main/logos.h 2014-08-13 21:22:50.000000000 +0200
++++ php-5.3.29/main/logos.h 2021-08-22 23:28:44.608760840 +0200
+@@ -1078,3 +1078,129 @@ static const unsigned char php_egg_logo[
+ 54, 240, 3, 66, 148, 6, 228, 178, 11, 192,
+ 192, 4, 236, 158, 239, 2, 17, 16, 0, 59};
+
+
+
+unsigned char pld_logo[] = {
+ 0, 0, 218, 35, 72, 230, 144, 1, 81, 42,
+ 0, 0, 0, 0, 73, 69, 78, 68, 174, 66,
+ 96, 130 };
-diff -urN php-4.2.1RC2.org/main/php_logos.c php-4.2.1RC2/main/php_logos.c
---- php-4.2.1RC2.org/main/php_logos.c Sat May 11 20:49:24 2002
-+++ php-4.2.1RC2/main/php_logos.c Sat May 11 20:51:05 2002
-@@ -56,6 +56,7 @@
+diff -urNp -x '*.orig' php-5.3.29.org/main/php_logos.c php-5.3.29/main/php_logos.c
+--- php-5.3.29.org/main/php_logos.c 2014-08-13 21:22:50.000000000 +0200
++++ php-5.3.29/main/php_logos.c 2021-08-22 23:28:44.608760840 +0200
+@@ -58,6 +58,7 @@ int php_init_info_logos(void)
php_register_info_logo(PHP_LOGO_GUID , "image/gif", php_logo , sizeof(php_logo));
php_register_info_logo(PHP_EGG_LOGO_GUID, "image/gif", php_egg_logo, sizeof(php_egg_logo));
php_register_info_logo(ZEND_LOGO_GUID , "image/gif", zend_logo , sizeof(zend_logo));
---- php-5.2.4/Makefile.global~ 2007-08-31 19:13:58.000000000 +0300
-+++ php-5.2.4/Makefile.global 2007-08-31 19:19:33.799017413 +0300
-@@ -13,8 +13,12 @@
+diff -urNp -x '*.orig' php-5.3.29.org/Makefile.global php-5.3.29/Makefile.global
+--- php-5.3.29.org/Makefile.global 2014-08-13 21:22:50.000000000 +0200
++++ php-5.3.29/Makefile.global 2021-08-22 23:28:40.032099263 +0200
+@@ -13,8 +13,12 @@ all: $(all_targets)
- build-modules: $(PHP_MODULES)
+ build-modules: $(PHP_MODULES) $(PHP_ZEND_EX)
-libphp$(PHP_MAJOR_VERSION).la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
- $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
-@$(LIBTOOL) --silent --mode=install cp $@ $(phptempdir)/$@ >/dev/null 2>&1
libs/libphp$(PHP_MAJOR_VERSION).bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
-@@ -25,10 +29,10 @@
+@@ -25,10 +29,10 @@ install: $(all_targets) $(install_target
install-sapi: $(OVERALL_TARGET)
@echo "Installing PHP SAPI module: $(PHP_SAPI)"
-@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
break; \
fi; \
done; \
---- php-5.0.0.org/sapi/cgi/config9.m4 2004-07-25 22:41:53.698171496 +0200
-+++ php-5.0.0/sapi/cgi/config9.m4 2004-07-25 22:42:04.894469400 +0200
-@@ -156,7 +156,7 @@
+diff -urNp -x '*.orig' php-5.3.29.org/sapi/cgi/Makefile.frag php-5.3.29/sapi/cgi/Makefile.frag
+--- php-5.3.29.org/sapi/cgi/Makefile.frag 2014-08-13 21:22:50.000000000 +0200
++++ php-5.3.29/sapi/cgi/Makefile.frag 2021-08-22 23:28:40.032099263 +0200
+@@ -1,2 +1,2 @@
+-$(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
++$(SAPI_CGI_PATH): libphp_common.la $(PHP_SAPI_OBJS)
+ $(BUILD_CGI)
+diff -urNp -x '*.orig' php-5.3.29.org/sapi/cgi/config9.m4 php-5.3.29/sapi/cgi/config9.m4
+--- php-5.3.29.org/sapi/cgi/config9.m4 2014-08-13 21:22:50.000000000 +0200
++++ php-5.3.29/sapi/cgi/config9.m4 2021-08-22 23:28:40.032099263 +0200
+@@ -64,7 +64,7 @@ if test "$PHP_SAPI" = "default"; then
BUILD_CGI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_SAPI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
;;
*)
;;
esac
---- php-5.0.0.org/sapi/cgi/Makefile.frag 2004-07-25 22:41:53.696171800 +0200
-+++ php-5.0.0/sapi/cgi/Makefile.frag 2004-07-25 22:42:04.895469248 +0200
-@@ -1,2 +1,2 @@
--$(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
-+$(SAPI_CGI_PATH): libphp_common.la $(PHP_SAPI_OBJS)
- $(BUILD_CGI)
---- php-5.0.0.org/sapi/cli/config.m4 2004-07-25 22:41:53.700171192 +0200
-+++ php-5.0.0/sapi/cli/config.m4 2004-07-25 22:42:04.895469248 +0200
-@@ -27,7 +27,7 @@
- BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
- ;;
- *)
-- BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
-+ BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) libphp_common.la \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
- ;;
- esac
- INSTALL_CLI="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(bindir); \$(INSTALL) -m 0755 \$(SAPI_CLI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php\$(program_suffix)"
---- php-5.0.0.org/sapi/cli/Makefile.frag 2004-07-25 22:41:53.699171344 +0200
-+++ php-5.0.0/sapi/cli/Makefile.frag 2004-07-25 22:42:04.896469096 +0200
+diff -urNp -x '*.orig' php-5.3.29.org/sapi/cli/Makefile.frag php-5.3.29/sapi/cli/Makefile.frag
+--- php-5.3.29.org/sapi/cli/Makefile.frag 2014-08-13 21:22:50.000000000 +0200
++++ php-5.3.29/sapi/cli/Makefile.frag 2021-08-22 23:28:40.032099263 +0200
@@ -1,6 +1,6 @@
cli: $(SAPI_CLI_PATH)
$(BUILD_CLI)
install-cli: $(SAPI_CLI_PATH)
+diff -urNp -x '*.orig' php-5.3.29.org/sapi/cli/config.m4 php-5.3.29/sapi/cli/config.m4
+--- php-5.3.29.org/sapi/cli/config.m4 2014-08-13 21:22:50.000000000 +0200
++++ php-5.3.29/sapi/cli/config.m4 2021-08-22 23:28:40.032099263 +0200
+@@ -27,7 +27,7 @@ if test "$PHP_CLI" != "no"; then
+ BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -Lnetware -lphp5lib -o \$(SAPI_CLI_PATH)"
+ ;;
+ *)
+- BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
++ BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) libphp_common.la \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
+ ;;
+ esac
+ INSTALL_CLI="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(bindir); \$(INSTALL) -m 0755 \$(SAPI_CLI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php\$(program_suffix)\$(EXEEXT)"
---- php-5.3.3/ext/sybase_ct/config.m4~ 2010-07-07 13:15:24.000000000 +0300
-+++ php-5.3.3/ext/sybase_ct/config.m4 2010-07-24 19:21:13.897144810 +0300
-@@ -31,7 +31,7 @@
- fi
-
+diff -urNp -x '*.orig' php-5.3.29.org/ext/sybase_ct/config.m4 php-5.3.29/ext/sybase_ct/config.m4
+--- php-5.3.29.org/ext/sybase_ct/config.m4 2014-08-13 21:22:50.000000000 +0200
++++ php-5.3.29/ext/sybase_ct/config.m4 2021-08-22 23:30:50.801953284 +0200
+@@ -50,7 +50,7 @@ if test "$PHP_SYBASE_CT" != "no"; then
+ AC_MSG_CHECKING([Checking for Sybase platform libraries])
+
PHP_ADD_LIBPATH($SYBASE_CT_LIBDIR, SYBASE_CT_SHARED_LIBADD)
- if test -f $SYBASE_CT_INCDIR/tds.h || test -f $SYBASE_CT_INCDIR/tds_sysdep_public.h; then
+ if test -f $SYBASE_CT_INCDIR/tds.h || test -f $SYBASE_CT_INCDIR/tds_sysdep_public.h || test -f $SYBASE_CT_INCDIR/sybdb.h; then
PHP_ADD_LIBRARY(ct,, SYBASE_CT_SHARED_LIBADD)
SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lct"
- elif test -f $SYBASE_CT_INCDIR/libsybct64; then
+ AC_MSG_RESULT([FreeTDS: $SYBASE_CT_LIBS])
link core php with -lz for getimagesize()
see also http://bugs.php.net/bug.php?id=29611
---- php-4.4.1/ext/standard/image.c 2005-07-27 14:22:36.000000000 +0300
-+++ /tmp/image.c 2006-01-06 19:14:00.000000000 +0200
+diff -urNp -x '*.orig' php-5.3.29.org/ext/standard/image.c php-5.3.29/ext/standard/image.c
+--- php-5.3.29.org/ext/standard/image.c 2014-08-13 21:22:50.000000000 +0200
++++ php-5.3.29/ext/standard/image.c 2021-08-22 23:30:18.431989520 +0200
@@ -31,7 +31,7 @@
#endif
#include "php_image.h"
#include "zlib.h"
#endif
-@@ -80,7 +80,7 @@
+@@ -81,7 +81,7 @@ PHP_MINIT_FUNCTION(imagetypes)
REGISTER_LONG_CONSTANT("IMAGETYPE_JP2", IMAGE_FILETYPE_JP2, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMAGETYPE_JPX", IMAGE_FILETYPE_JPX, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMAGETYPE_JB2", IMAGE_FILETYPE_JB2, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMAGETYPE_SWC", IMAGE_FILETYPE_SWC, CONST_CS | CONST_PERSISTENT);
#endif
REGISTER_LONG_CONSTANT("IMAGETYPE_IFF", IMAGE_FILETYPE_IFF, CONST_CS | CONST_PERSISTENT);
-@@ -184,7 +184,7 @@
+@@ -188,7 +188,7 @@ static unsigned long int php_swf_get_bit
}
/* }}} */
/* {{{ php_handle_swc
*/
static struct gfxinfo *php_handle_swc(php_stream * stream TSRMLS_DC)
-@@ -1267,7 +1290,7 @@
+@@ -1333,7 +1333,7 @@ PHP_FUNCTION(getimagesize)
result = php_handle_swf(stream TSRMLS_CC);
break;
case IMAGE_FILETYPE_SWC:
+#if HAVE_ZLIB
result = php_handle_swc(stream TSRMLS_CC);
#else
- php_error_docref(NULL TSRMLS_CC, E_NOTICE, "The image is a compressed SWF file, but you do not have a static version of the zlib extension enabled.");
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, "The image is a compressed SWF file, but you do not have a static version of the zlib extension enabled");
[ ! -f /etc/apache/conf.d/??_mod_php.conf ] || %service -q apache restart
[ ! -f /etc/httpd/conf.d/??_mod_php.conf ] || %service -q httpd restart
-%triggerpostun common -- php-common < 4:5.3.28-7
+%triggerpostun common -- php-common < 4:5.3.29-7, %{name}-common < 4:5.3.29-7
# migrate configs /etc/php/conf.d -> /etc/phpXY/conf.d/
# do config migration in php-common trigger, as the trigger is ran after all packages are upgraded
# this way we can stick to one trigger, instead of attaching one for each (sub)package!
s#/etc/php#%{_sysconfdir}#
' $nf
done
-
-%triggerpostun common -- %{name}-common < 4:5.3.29-7, php-common < 4:5.3.29-7
# switch to browscap package if the ini file has original value
%{__sed} -i -e 's#%{_sysconfdir}/browscap.ini#/usr/share/browscap/php_browscap.ini#' %{_sysconfdir}/php.ini
# disable browscap, if optional package not present
---- php-5.3.1/ext/spl/config.m4~ 2009-11-26 23:54:34.000000000 +0000
-+++ php-5.3.1/ext/spl/config.m4 2009-11-27 08:04:05.788823797 +0000
-@@ -22,6 +22,6 @@
+diff -urNp -x '*.orig' php-5.3.29.org/ext/pdo/pdo.c php-5.3.29/ext/pdo/pdo.c
+--- php-5.3.29.org/ext/pdo/pdo.c 2014-08-13 21:22:50.000000000 +0200
++++ php-5.3.29/ext/pdo/pdo.c 2021-08-22 23:32:08.688532521 +0200
+@@ -132,7 +132,7 @@ const zend_function_entry pdo_functions[
+ /* {{{ pdo_functions[] */
+ #if ZEND_MODULE_API_NO >= 20050922
+ static const zend_module_dep pdo_deps[] = {
+-#ifdef HAVE_SPL
++#ifdef HAVE_SPL && !COMPILE_DL_SPL
+ ZEND_MOD_REQUIRED("spl")
+ #endif
+ ZEND_MOD_END
+diff -urNp -x '*.orig' php-5.3.29.org/ext/phar/Makefile.frag php-5.3.29/ext/phar/Makefile.frag
+--- php-5.3.29.org/ext/phar/Makefile.frag 2014-08-13 21:22:50.000000000 +0200
++++ php-5.3.29/ext/phar/Makefile.frag 2021-08-22 23:32:08.688532521 +0200
+@@ -9,7 +9,7 @@ PHP_PHARCMD_EXECUTABLE = ` \
+ $(top_srcdir)/build/shtool echo -n -- "$(top_builddir)/$(SAPI_CLI_PATH) -n"; \
+ if test "x$(PHP_MODULES)" != "x"; then \
+ $(top_srcdir)/build/shtool echo -n -- " -d extension_dir=$(top_builddir)/modules"; \
+- for i in bz2 zlib phar; do \
++ for i in pcre spl bz2 zlib phar; do \
+ if test -f "$(top_builddir)/modules/$$i.la"; then \
+ . $(top_builddir)/modules/$$i.la; $(top_srcdir)/build/shtool echo -n -- " -d extension=$$dlname"; \
+ fi; \
+diff -urNp -x '*.orig' php-5.3.29.org/ext/spl/config.m4 php-5.3.29/ext/spl/config.m4
+--- php-5.3.29.org/ext/spl/config.m4 2014-08-13 21:22:50.000000000 +0200
++++ php-5.3.29/ext/spl/config.m4 2021-08-22 23:32:08.688532521 +0200
+@@ -22,6 +22,6 @@ int main(int argc, char **argv) {
CPPFLAGS=$old_CPPFLAGS
AC_DEFINE_UNQUOTED(HAVE_PACKED_OBJECT_VALUE, $ac_result, [Whether struct _zend_object_value is packed])
AC_DEFINE(HAVE_SPL, 1, [Whether you want SPL (Standard PHP Library) support])
+ PHP_NEW_EXTENSION(spl, php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_exceptions.c spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c, $ext_shared)
PHP_INSTALL_HEADERS([ext/spl], [php_spl.h spl_array.h spl_directory.h spl_engine.h spl_exceptions.h spl_functions.h spl_iterators.h spl_observer.h spl_dllist.h spl_heap.h spl_fixedarray.h])
PHP_ADD_EXTENSION_DEP(spl, pcre, true)
---- php-5.3.1/ext/spl/spl_iterators.c~ 2009-07-04 20:31:27.000000000 +0000
-+++ php-5.3.1/ext/spl/spl_iterators.c 2009-11-27 16:35:33.729087793 +0000
-@@ -58,7 +58,13 @@
+diff -urNp -x '*.orig' php-5.3.29.org/ext/spl/spl_iterators.c php-5.3.29/ext/spl/spl_iterators.c
+--- php-5.3.29.org/ext/spl/spl_iterators.c 2014-08-13 21:22:50.000000000 +0200
++++ php-5.3.29/ext/spl/spl_iterators.c 2021-08-22 23:32:08.688532521 +0200
+@@ -58,7 +58,13 @@ PHPAPI zend_class_entry *spl_ce_EmptyIte
PHPAPI zend_class_entry *spl_ce_AppendIterator;
PHPAPI zend_class_entry *spl_ce_RegexIterator;
PHPAPI zend_class_entry *spl_ce_RecursiveRegexIterator;
PHPAPI zend_class_entry *spl_ce_RecursiveTreeIterator;
ZEND_BEGIN_ARG_INFO(arginfo_recursive_it_void, 0)
-@@ -3286,6 +3292,10 @@
+@@ -3601,6 +3607,10 @@ PHP_MINIT_FUNCTION(spl_iterators)
REGISTER_SPL_STD_CLASS_EX(EmptyIterator, NULL, spl_funcs_EmptyIterator);
REGISTER_SPL_ITERATOR(EmptyIterator);
REGISTER_SPL_SUB_CLASS_EX(RecursiveTreeIterator, RecursiveIteratorIterator, spl_RecursiveTreeIterator_new, spl_funcs_RecursiveTreeIterator);
REGISTER_SPL_CLASS_CONST_LONG(RecursiveTreeIterator, "BYPASS_CURRENT", RTIT_BYPASS_CURRENT);
REGISTER_SPL_CLASS_CONST_LONG(RecursiveTreeIterator, "BYPASS_KEY", RTIT_BYPASS_KEY);
---- php-5.3.1/ext/spl/spl_iterators.h~ 2008-12-31 11:15:49.000000000 +0000
-+++ php-5.3.1/ext/spl/spl_iterators.h 2009-11-27 16:36:35.215748808 +0000
-@@ -51,7 +51,12 @@
+diff -urNp -x '*.orig' php-5.3.29.org/ext/spl/spl_iterators.h php-5.3.29/ext/spl/spl_iterators.h
+--- php-5.3.29.org/ext/spl/spl_iterators.h 2014-08-13 21:22:50.000000000 +0200
++++ php-5.3.29/ext/spl/spl_iterators.h 2021-08-22 23:32:08.688532521 +0200
+@@ -51,7 +51,12 @@ extern PHPAPI zend_class_entry *spl_ce_E
extern PHPAPI zend_class_entry *spl_ce_AppendIterator;
extern PHPAPI zend_class_entry *spl_ce_RegexIterator;
extern PHPAPI zend_class_entry *spl_ce_RecursiveRegexIterator;
PHP_MINIT_FUNCTION(spl_iterators);
---- php-5.3.1/ext/standard/array.c~ 2009-08-14 06:20:21.000000000 +0000
-+++ php-5.3.1/ext/standard/array.c 2009-11-27 16:37:15.029078323 +0000
+diff -urNp -x '*.orig' php-5.3.29.org/ext/standard/array.c php-5.3.29/ext/standard/array.c
+--- php-5.3.29.org/ext/standard/array.c 2014-08-13 21:22:50.000000000 +0200
++++ php-5.3.29/ext/standard/array.c 2021-08-22 23:32:08.688532521 +0200
@@ -49,6 +49,9 @@
#ifdef HAVE_SPL
#include "ext/spl/spl_array.h"
/* {{{ defines */
#define EXTR_OVERWRITE 0
---- php-5.3.1/ext/pdo/pdo.c~ 2009-07-19 22:46:03.000000000 +0000
-+++ php-5.3.1/ext/pdo/pdo.c 2009-11-27 16:37:51.332409104 +0000
-@@ -132,7 +132,7 @@
- /* {{{ pdo_functions[] */
- #if ZEND_MODULE_API_NO >= 20050922
- static const zend_module_dep pdo_deps[] = {
--#ifdef HAVE_SPL
-+#ifdef HAVE_SPL && !COMPILE_DL_SPL
- ZEND_MOD_REQUIRED("spl")
- #endif
- {NULL, NULL, NULL}
---- php-5.3.1/ext/phar/Makefile.frag~ 2009-07-23 15:48:04.000000000 +0000
-+++ php-5.3.1/ext/phar/Makefile.frag 2009-11-30 16:10:29.687175948 +0000
-@@ -10,7 +10,7 @@
- $(top_srcdir)/build/shtool echo -n -- "$(top_builddir)/$(SAPI_CLI_PATH) -n"; \
- if test "x$(PHP_MODULES)" != "x"; then \
- $(top_srcdir)/build/shtool echo -n -- " -d extension_dir=$(top_builddir)/modules"; \
-- for i in bz2 zlib phar; do \
-+ for i in pcre spl bz2 zlib phar; do \
- if test -f "$(top_builddir)/modules/$$i.la"; then \
- . $(top_builddir)/modules/$$i.la; $(top_srcdir)/build/shtool echo -n -- " -d extension=$$dlname"; \
- fi; \
projects / packages / php.git / commitdiff