---- php-5.3.27/ext/mysqli/mysqli_nonapi.c~ 2013-11-20 00:19:11.000000000 +0200
-+++ php-5.3.27/ext/mysqli/mysqli_nonapi.c 2013-11-20 00:19:44.725872552 +0200
-@@ -73,7 +73,7 @@
+diff -urNp -x '*.orig' php-7.0.33.org/ext/mysqli/mysqli_nonapi.c php-7.0.33/ext/mysqli/mysqli_nonapi.c
+--- php-7.0.33.org/ext/mysqli/mysqli_nonapi.c 2018-12-04 18:22:49.000000000 +0100
++++ php-7.0.33/ext/mysqli/mysqli_nonapi.c 2021-08-23 23:36:57.788993126 +0200
+@@ -72,7 +72,7 @@ void mysqli_common_connect(INTERNAL_FUNC
zend_bool self_alloced = 0;
-#if !defined(MYSQL_USE_MYSQLND)
+#if 0 && !defined(MYSQL_USE_MYSQLND)
if ((MYSQL_VERSION_ID / 100) != (mysql_get_client_version() / 100)) {
- php_error_docref(NULL TSRMLS_CC, E_NOTICE,
+ php_error_docref(NULL, E_WARNING,
"Headers and client library minor version mismatch. Headers:%d Library:%ld",
---- php-7.0/ext/pcre/config0.m4~ 2015-05-24 14:39:04.000000000 +0300
-+++ php-7.0/ext/pcre/config0.m4 2015-05-24 14:53:49.980250297 +0300
-@@ -11,7 +11,7 @@
+diff -urNp -x '*.orig' php-7.0.33.org/ext/pcre/config0.m4 php-7.0.33/ext/pcre/config0.m4
+--- php-7.0.33.org/ext/pcre/config0.m4 2018-12-04 18:22:58.000000000 +0100
++++ php-7.0.33/ext/pcre/config0.m4 2021-08-23 23:36:40.675466313 +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,13 @@
+@@ -43,12 +43,13 @@ 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])
-@@ -61,7 +62,7 @@
+@@ -61,7 +62,7 @@ PHP_ARG_WITH(pcre-regex,,
pcrelib/pcre_version.c pcrelib/pcre_xclass.c \
pcrelib/pcre_jit_compile.c"
PHP_PCRE_CFLAGS="-DHAVE_CONFIG_H -I@ext_srcdir@/pcrelib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"
PHP_ADD_BUILD_DIR($ext_builddir/pcrelib)
PHP_INSTALL_HEADERS([ext/pcre], [php_pcre.h pcrelib/])
AC_DEFINE(HAVE_BUNDLED_PCRE, 1, [ ])
---- php-7.0/ext/pcre/php_pcre.h~ 2015-05-21 17:57:06.000000000 +0300
-+++ php-7.0/ext/pcre/php_pcre.h 2015-05-24 14:56:27.528425546 +0300
-@@ -34,7 +34,12 @@
- #endif
-
- PHPAPI zend_string *php_pcre_replace(zend_string *regex, zend_string *subject_str, char *subject, int subject_len, zval *replace_val, int is_callable_replace, int limit, int *replace_count);
-+#if COMPILE_DL_PCRE
-+#define pcre_get_compiled_regex pcre_get_compiled_regex_p
-+extern PHPAPI pcre* (*pcre_get_compiled_regex)(zend_string *regex, pcre_extra **extra, int *options);
-+#else
- PHPAPI pcre* pcre_get_compiled_regex(zend_string *regex, pcre_extra **extra, int *options);
-+#endif
- PHPAPI pcre* pcre_get_compiled_regex_ex(zend_string *regex, pcre_extra **extra, int *preg_options, int *coptions);
-
- 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
-@@ -27,6 +27,11 @@
+diff -urNp -x '*.orig' php-7.0.33.org/ext/pcre/php_pcre.c php-7.0.33/ext/pcre/php_pcre.c
+--- php-7.0.33.org/ext/pcre/php_pcre.c 2018-12-04 18:22:58.000000000 +0100
++++ php-7.0.33/ext/pcre/php_pcre.c 2021-08-23 23:36:40.675466313 +0200
+@@ -28,6 +28,11 @@
#if HAVE_PCRE || HAVE_BUNDLED_PCRE
#include "ext/standard/php_string.h"
#define PREG_PATTERN_ORDER 1
-@@ -153,6 +158,10 @@
- REGISTER_LONG_CONSTANT("PREG_BAD_UTF8_OFFSET_ERROR", PHP_PCRE_BAD_UTF8_OFFSET_ERROR, CONST_CS | CONST_PERSISTENT);
+@@ -202,6 +207,10 @@ static PHP_MINIT_FUNCTION(pcre)
+ REGISTER_LONG_CONSTANT("PREG_JIT_STACKLIMIT_ERROR", PHP_PCRE_JIT_STACKLIMIT_ERROR, CONST_CS | CONST_PERSISTENT);
REGISTER_STRING_CONSTANT("PCRE_VERSION", (char *)pcre_version(), CONST_CS | CONST_PERSISTENT);
+#if COMPILE_DL_PCRE
return SUCCESS;
}
/* }}} */
-@@ -429,6 +438,7 @@
+@@ -610,6 +619,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;
+ PHPAPI pcre* pcre_get_compiled_regex(zend_string *regex, pcre_extra **extra, int *preg_options)
+diff -urNp -x '*.orig' php-7.0.33.org/ext/pcre/php_pcre.h php-7.0.33/ext/pcre/php_pcre.h
+--- php-7.0.33.org/ext/pcre/php_pcre.h 2018-12-04 18:22:58.000000000 +0100
++++ php-7.0.33/ext/pcre/php_pcre.h 2021-08-23 23:36:40.675466313 +0200
+@@ -34,7 +34,12 @@
+ #endif
+
+ PHPAPI zend_string *php_pcre_replace(zend_string *regex, zend_string *subject_str, char *subject, int subject_len, zval *replace_val, int is_callable_replace, int limit, int *replace_count);
++#if COMPILE_DL_PCRE
++#define pcre_get_compiled_regex pcre_get_compiled_regex_p
++extern PHPAPI pcre* (*pcre_get_compiled_regex)(zend_string *regex, pcre_extra **extra, int *options);
++#else
+ PHPAPI pcre* pcre_get_compiled_regex(zend_string *regex, pcre_extra **extra, int *options);
++#endif
+ PHPAPI pcre* pcre_get_compiled_regex_ex(zend_string *regex, pcre_extra **extra, int *preg_options, int *coptions);
+
+ extern zend_module_entry pcre_module_entry;
+diff -urNp -x '*.orig' php-7.0.33.org/ext/standard/browscap.c php-7.0.33/ext/standard/browscap.c
+--- php-7.0.33.org/ext/standard/browscap.c 2018-12-04 18:22:44.000000000 +0100
++++ php-7.0.33/ext/standard/browscap.c 2021-08-23 23:36:40.675466313 +0200
+@@ -65,6 +65,11 @@ ZEND_END_MODULE_GLOBALS(browscap)
+ ZEND_DECLARE_MODULE_GLOBALS(browscap)
+ #define BROWSCAP_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(browscap, v)
+#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 @@
- --EXPECTF--
- [PHP Modules]
- %a
--pcre
--%a
-
- [Zend Modules]
- %aDone
---- php-7.0.0beta3/main/php_ini.c~ 2015-08-26 18:50:15.000000000 +0300
-+++ php-7.0.0beta3/main/php_ini.c 2015-08-26 22:33:59.126957396 +0300
-@@ -765,8 +765,8 @@
+diff -urNp -x '*.orig' php-7.0.33.org/main/php_ini.c php-7.0.33/main/php_ini.c
+--- php-7.0.33.org/main/php_ini.c 2021-08-23 23:36:39.715453953 +0200
++++ php-7.0.33/main/php_ini.c 2021-08-23 23:36:40.675466313 +0200
+@@ -771,8 +771,8 @@ int php_shutdown_config(void)
*/
void php_ini_register_extensions(void)
{
zend_llist_destroy(&extension_lists.engine);
zend_llist_destroy(&extension_lists.functions);
+diff -urNp -x '*.orig' php-7.0.33.org/sapi/cli/tests/018.phpt php-7.0.33/sapi/cli/tests/018.phpt
+--- php-7.0.33.org/sapi/cli/tests/018.phpt 2018-12-04 18:23:02.000000000 +0100
++++ php-7.0.33/sapi/cli/tests/018.phpt 2021-08-23 23:36:40.675466313 +0200
+@@ -20,8 +20,6 @@ echo "Done\n";
+ --EXPECTF--
+ [PHP Modules]
+ %a
+-pcre
+-%a
+
+ [Zend Modules]
+ %aDone
---- 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-7.0.33.org/Makefile.global php-7.0.33/Makefile.global
+--- php-7.0.33.org/Makefile.global 2021-08-23 23:36:01.621387183 +0200
++++ php-7.0.33/Makefile.global 2021-08-23 23:36:02.531412918 +0200
+@@ -23,6 +23,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)
-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-7.0.33.org/scripts/Makefile.frag php-7.0.33/scripts/Makefile.frag
+--- php-7.0.33.org/scripts/Makefile.frag 2018-12-04 18:23:02.000000000 +0100
++++ php-7.0.33/scripts/Makefile.frag 2021-08-23 23:36:04.841475774 +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
-@@ -3,7 +3,7 @@
- # Variable declaration
+diff -urNp -x '*.orig' php-7.0.33.org/scripts/phpize.in php-7.0.33/scripts/phpize.in
+--- php-7.0.33.org/scripts/phpize.in 2018-12-04 18:23:02.000000000 +0100
++++ php-7.0.33/scripts/phpize.in 2021-08-23 23:36:04.841475774 +0200
+@@ -4,7 +4,7 @@
prefix='@prefix@'
+ datarootdir='@datarootdir@'
exec_prefix="`eval echo @exec_prefix@`"
-phpdir="`eval echo @libdir@`/build"
+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-7.0.33.org/scripts/php-config.in php-7.0.33/scripts/php-config.in
+--- php-7.0.33.org/scripts/php-config.in 2018-12-04 18:23:02.000000000 +0100
++++ php-7.0.33/scripts/php-config.in 2021-08-23 23:36:14.341700815 +0200
+@@ -4,6 +4,7 @@ SED="@SED@"
prefix="@prefix@"
+ datarootdir="@datarootdir@"
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"
+@@ -55,6 +56,8 @@ case "$1" in
echo $extension_dir;;
--include-dir)
echo $include_dir;;
--php-binary)
echo $php_binary;;
--php-sapis)
-@@ -72,6 +75,7 @@
+@@ -76,6 +79,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]
---- php-7.0.2/ext/dba/config.m4~ 2016-01-11 00:42:48.000000000 +0200
-+++ php-7.0.2/ext/dba/config.m4 2016-01-11 00:43:39.055351157 +0200
-@@ -287,6 +287,14 @@
+diff -urNp -x '*.orig' php-7.0.33.org/ext/dba/config.m4 php-7.0.33/ext/dba/config.m4
+--- php-7.0.33.org/ext/dba/config.m4 2021-08-23 23:36:54.322290784 +0200
++++ php-7.0.33/ext/dba/config.m4 2021-08-23 23:36:55.295634288 +0200
+@@ -326,6 +326,14 @@ if test "$PHP_DB4" != "no"; then
THIS_PREFIX=$i
- THIS_INCLUDE=$i/db4/db.h
+ THIS_INCLUDE=$i/include/db5.3/db.h
break
+ elif test -f "$i/include/db5.3/db.h"; then
+ THIS_PREFIX=$i
elif test -f "$i/include/db5.1/db.h"; then
THIS_PREFIX=$i
THIS_INCLUDE=$i/include/db5.1/db.h
-@@ -376,7 +376,7 @@
+@@ -368,7 +376,7 @@ if test "$PHP_DB4" != "no"; then
break
fi
done
fi
PHP_DBA_STD_RESULT(db4,Berkeley DB4)
-
echo "end!<br>\n";
?>
---- php-7.0.0beta1/sapi/cgi/cgi_main.c~ 2015-07-13 16:14:53.000000000 +0300
-+++ php-7.0.0beta1/sapi/cgi/cgi_main.c 2015-07-15 13:51:32.072326529 +0300
-@@ -101,6 +101,9 @@
- */
- static int parent = 1;
+diff -urNp -x '*.orig' php-7.0.33.org/sapi/cgi/cgi_main.c php-7.0.33/sapi/cgi/cgi_main.c
+--- php-7.0.33.org/sapi/cgi/cgi_main.c 2018-12-04 18:23:01.000000000 +0100
++++ php-7.0.33/sapi/cgi/cgi_main.c 2021-08-23 23:36:16.728416784 +0200
+@@ -110,6 +110,9 @@ static void (*php_php_import_environment
+ 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);
+@@ -1433,6 +1436,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)
-@@ -1764,7 +1764,6 @@
+@@ -1728,7 +1746,6 @@ int main(int argc, char *argv[])
int requests = 0;
int fastcgi;
char *bindpath = NULL;
- int fcgi_fd = 0;
fcgi_request *request = NULL;
+ int warmup_repeats = 0;
int repeats = 1;
- int benchmark = 0;
-@@ -2050,10 +2050,13 @@
+@@ -2036,10 +2053,13 @@ consult the installation file that came
*/
parent = 0;
---- php-5.6.2/sapi/fpm/php-fpm.conf.in 2014-10-27 08:20:34.963718145 +0200
-+++ php-5.6.2.old/sapi/fpm/php-fpm.conf.in 2014-10-27 08:07:47.762117299 +0200
+diff -urNp -x '*.orig' php-7.0.33.org/sapi/fpm/Makefile.frag php-7.0.33/sapi/fpm/Makefile.frag
+--- php-7.0.33.org/sapi/fpm/Makefile.frag 2018-12-04 18:23:02.000000000 +0100
++++ php-7.0.33/sapi/fpm/Makefile.frag 2021-08-23 23:36:26.265257286 +0200
+@@ -14,9 +14,9 @@ install-fpm: $(SAPI_FPM_PATH)
+ echo "Installing PHP FPM defconfig: skipping"; \
+ else \
+ echo "Installing PHP FPM defconfig: $(INSTALL_ROOT)$(sysconfdir)/" && \
+- $(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d; \
+- $(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf.default; \
+- $(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d/www.conf.default; \
++ $(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir)/fpm.d; \
++ $(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf; \
++ $(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/fpm.d/www.conf; \
+ fi
+
+ @echo "Installing PHP FPM man page: $(INSTALL_ROOT)$(mandir)/man8/"
+diff -urNp -x '*.orig' php-7.0.33.org/sapi/fpm/php-fpm.conf.in php-7.0.33/sapi/fpm/php-fpm.conf.in
+--- php-7.0.33.org/sapi/fpm/php-fpm.conf.in 2018-12-04 18:23:01.000000000 +0100
++++ php-7.0.33/sapi/fpm/php-fpm.conf.in 2021-08-23 23:36:26.265257286 +0200
@@ -14,14 +14,14 @@
; Pid file
; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
; syslog_facility is used to specify what type of program is logging the
; message. This lets syslogd specify that messages from different facilities
---- php-5.6.5/sapi/fpm/www.conf.in~ 2015-02-04 19:26:16.000000000 +0200
-+++ php-5.6.5/sapi/fpm/www.conf.in 2015-02-04 19:27:25.275218535 +0200
-@@ -32,7 +32,7 @@
- ; specific port;
+diff -urNp -x '*.orig' php-7.0.33.org/sapi/fpm/status.html.in php-7.0.33/sapi/fpm/status.html.in
+--- php-7.0.33.org/sapi/fpm/status.html.in 2018-12-04 18:23:02.000000000 +0100
++++ php-7.0.33/sapi/fpm/status.html.in 2021-08-23 23:36:26.265257286 +0200
+@@ -96,7 +96,7 @@
+ var sort_index;
+ var sort_order;
+
+- doc_url.value = location.protocol + '//' + location.host + "/status?json&full";
++ doc_url.value = location.protocol + '//' + location.host + "/fpm-status?json&full";
+
+ ths = document.getElementsByTagName("th");
+ for (var i=0; i<ths.length; i++) {
+diff -urNp -x '*.orig' php-7.0.33.org/sapi/fpm/www.conf.in php-7.0.33/sapi/fpm/www.conf.in
+--- php-7.0.33.org/sapi/fpm/www.conf.in 2018-12-04 18:23:02.000000000 +0100
++++ php-7.0.33/sapi/fpm/www.conf.in 2021-08-23 23:36:26.265257286 +0200
+@@ -33,7 +33,7 @@ group = @php_fpm_group@
+ ; (IPv6 and IPv4-mapped) on a specific port;
; '/path/to/unix/socket' - to listen on a unix socket.
; Note: This value is mandatory.
-listen = 127.0.0.1:9000
+listen = /var/run/php/@processname@.sock
; Set listen(2) backlog.
- ; Default Value: 65535 (-1 on FreeBSD and OpenBSD)
-@@ -46,9 +46,9 @@
- ; BSD-derived systems allow connections regardless of permissions.
+ ; Default Value: 511 (-1 on FreeBSD and OpenBSD)
+@@ -44,9 +44,9 @@ listen = 127.0.0.1:9000
+ ; BSD-derived systems allow connections regardless of permissions.
; Default Values: user and group are set as the running user
; mode is set to 0660
-;listen.owner = @php_fpm_user@
; When POSIX Access Control Lists are supported you can set them using
; these options, value is a comma separated list of user/group names.
; When set, listen.owner and listen.group are ignored
-@@ -53,7 +53,7 @@
+@@ -59,7 +59,7 @@ listen = 127.0.0.1:9000
; must be separated by a comma. If this value is left blank, connections will be
; accepted from any ip address.
; Default Value: any
; Specify the nice(2) priority to apply to the pool processes (only if set)
; The value can vary from -19 (highest priority) to 20 (lower priority)
-@@ -372,7 +372,7 @@
+@@ -388,7 +388,7 @@ pm.max_spare_servers = 3
; the current environment.
; Default Value: clean env
;env[HOSTNAME] = $HOSTNAME
;env[TMP] = /tmp
;env[TMPDIR] = /tmp
;env[TEMP] = /tmp
---- php-5.3.9/sapi/fpm/status.html.in~ 2011-10-08 23:43:12.000000000 +0300
-+++ php-5.3.9/sapi/fpm/status.html.in 2012-01-12 02:19:09.573191879 +0200
-@@ -96,7 +96,7 @@
- var sort_index;
- var sort_order;
-
-- doc_url.value = location.protocol + '//' + location.host + "/status?json&full";
-+ doc_url.value = location.protocol + '//' + location.host + "/fpm-status?json&full";
-
- ths = document.getElementsByTagName("th");
- for (var i=0; i<ths.length; i++) {
---- php-7.1.3/sapi/fpm/Makefile.frag~ 2017-03-14 15:17:50.000000000 +0200
-+++ php-7.1.3/sapi/fpm/Makefile.frag 2017-03-28 09:44:28.799989897 +0300
-@@ -14,9 +14,9 @@
- echo "Installing PHP FPM defconfig: skipping"; \
- else \
- echo "Installing PHP FPM defconfig: $(INSTALL_ROOT)$(sysconfdir)/" && \
-- $(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d; \
-- $(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf.default; \
-- $(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d/www.conf.default; \
-+ $(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir)/fpm.d; \
-+ $(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf; \
-+ $(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/fpm.d/www.conf; \
- fi
-
- @echo "Installing PHP FPM man page: $(INSTALL_ROOT)$(mandir)/man8/"
---- php-5.5.38.orig/ext/intl/breakiterator/breakiterator_class.cpp 2016-07-20 10:41:48.000000000 +0200
-+++ php-5.5.38/ext/intl/breakiterator/breakiterator_class.cpp 2019-04-18 09:26:37.409910360 +0200
-@@ -38,6 +38,7 @@
+diff -urNp -x '*.orig' php-7.0.33.org/ext/intl/breakiterator/breakiterator_class.cpp php-7.0.33/ext/intl/breakiterator/breakiterator_class.cpp
+--- php-7.0.33.org/ext/intl/breakiterator/breakiterator_class.cpp 2018-12-04 18:22:53.000000000 +0100
++++ php-7.0.33/ext/intl/breakiterator/breakiterator_class.cpp 2021-08-23 23:37:07.399084984 +0200
+@@ -38,6 +38,7 @@ extern "C" {
}
using PHP::CodePointBreakIterator;
/* {{{ Global variables */
zend_class_entry *BreakIterator_ce_ptr;
---- php-5.5.38.orig/ext/intl/breakiterator/breakiterator_class.h 2016-07-20 10:41:48.000000000 +0200
-+++ php-5.5.38/ext/intl/breakiterator/breakiterator_class.h 2019-04-18 09:27:25.925787455 +0200
+diff -urNp -x '*.orig' php-7.0.33.org/ext/intl/breakiterator/breakiterator_class.h php-7.0.33/ext/intl/breakiterator/breakiterator_class.h
+--- php-7.0.33.org/ext/intl/breakiterator/breakiterator_class.h 2018-12-04 18:22:53.000000000 +0100
++++ php-7.0.33/ext/intl/breakiterator/breakiterator_class.h 2021-08-23 23:37:07.399084984 +0200
@@ -26,6 +26,8 @@
#ifndef USE_BREAKITERATOR_POINTER
#endif
typedef struct {
---- php-5.5.38.orig/ext/intl/breakiterator/breakiterator_methods.cpp 2016-07-20 10:41:48.000000000 +0200
-+++ php-5.5.38/ext/intl/breakiterator/breakiterator_methods.cpp 2019-04-18 09:30:32.998928523 +0200
-@@ -32,6 +32,8 @@
+diff -urNp -x '*.orig' php-7.0.33.org/ext/intl/breakiterator/breakiterator_methods.cpp php-7.0.33/ext/intl/breakiterator/breakiterator_methods.cpp
+--- php-7.0.33.org/ext/intl/breakiterator/breakiterator_methods.cpp 2018-12-04 18:22:53.000000000 +0100
++++ php-7.0.33/ext/intl/breakiterator/breakiterator_methods.cpp 2021-08-23 23:37:07.399084984 +0200
+@@ -32,6 +32,8 @@ extern "C" {
}
using PHP::CodePointBreakIterator;
U_CFUNC PHP_METHOD(BreakIterator, __construct)
{
---- php-5.5.38.orig/ext/intl/breakiterator/codepointiterator_internal.cpp 2016-07-20 10:41:48.000000000 +0200
-+++ php-5.5.38/ext/intl/breakiterator/codepointiterator_internal.cpp 2019-04-18 09:24:40.240427586 +0200
-@@ -30,6 +30,7 @@
+diff -urNp -x '*.orig' php-7.0.33.org/ext/intl/breakiterator/codepointiterator_internal.cpp php-7.0.33/ext/intl/breakiterator/codepointiterator_internal.cpp
+--- php-7.0.33.org/ext/intl/breakiterator/codepointiterator_internal.cpp 2018-12-04 18:22:53.000000000 +0100
++++ php-7.0.33/ext/intl/breakiterator/codepointiterator_internal.cpp 2021-08-23 23:37:07.399084984 +0200
+@@ -32,6 +32,7 @@ typedef union {
#define U_ALIGNMENT_OFFSET_UP(ptr) (sizeof(UAlignedMemory) - U_ALIGNMENT_OFFSET(ptr))
using namespace PHP;
UOBJECT_DEFINE_RTTI_IMPLEMENTATION(CodePointBreakIterator);
---- php-5.5.38.orig/ext/intl/breakiterator/codepointiterator_internal.h 2016-07-20 10:41:48.000000000 +0200
-+++ php-5.5.38/ext/intl/breakiterator/codepointiterator_internal.h 2019-04-18 09:25:57.127796222 +0200
+diff -urNp -x '*.orig' php-7.0.33.org/ext/intl/breakiterator/codepointiterator_internal.h php-7.0.33/ext/intl/breakiterator/codepointiterator_internal.h
+--- php-7.0.33.org/ext/intl/breakiterator/codepointiterator_internal.h 2018-12-04 18:22:53.000000000 +0100
++++ php-7.0.33/ext/intl/breakiterator/codepointiterator_internal.h 2021-08-23 23:37:07.399084984 +0200
@@ -18,8 +18,11 @@
#define CODEPOINTITERATOR_INTERNAL_H
namespace PHP {
---- php-5.5.38.orig/ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp 2016-07-20 10:41:48.000000000 +0200
-+++ php-5.5.38/ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp 2019-04-18 09:30:55.920130219 +0200
-@@ -25,6 +25,9 @@
-
- #include "../ext/intl_convertcpp.h"
+diff -urNp -x '*.orig' php-7.0.33.org/ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp php-7.0.33/ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp
+--- php-7.0.33.org/ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp 2018-12-04 18:22:53.000000000 +0100
++++ php-7.0.33/ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp 2021-08-23 23:37:07.399084984 +0200
+@@ -26,6 +26,9 @@ extern "C" {
+ #include "../intl_convertcpp.h"
+ #include "../intl_common.h"
+using icu::RuleBasedBreakIterator;
+using icu::Locale;
static inline RuleBasedBreakIterator *fetch_rbbi(BreakIterator_object *bio) {
return (RuleBasedBreakIterator*)bio->biter;
}
---- php-5.5.38.orig/ext/intl/calendar/calendar_class.cpp 2016-07-20 10:41:48.000000000 +0200
-+++ php-5.5.38/ext/intl/calendar/calendar_class.cpp 2019-04-18 09:21:08.825998526 +0200
-@@ -34,6 +34,9 @@
+diff -urNp -x '*.orig' php-7.0.33.org/ext/intl/calendar/calendar_class.cpp php-7.0.33/ext/intl/calendar/calendar_class.cpp
+--- php-7.0.33.org/ext/intl/calendar/calendar_class.cpp 2018-12-04 18:22:53.000000000 +0100
++++ php-7.0.33/ext/intl/calendar/calendar_class.cpp 2021-08-23 23:37:07.399084984 +0200
+@@ -34,6 +34,9 @@ extern "C" {
#include <assert.h>
}
/* {{{ Global variables */
zend_class_entry *Calendar_ce_ptr;
zend_class_entry *GregorianCalendar_ce_ptr;
---- php-5.5.38.orig/ext/intl/calendar/calendar_class.h 2016-07-20 10:41:48.000000000 +0200
-+++ php-5.5.38/ext/intl/calendar/calendar_class.h 2019-04-18 08:51:22.553104240 +0200
+diff -urNp -x '*.orig' php-7.0.33.org/ext/intl/calendar/calendar_class.h php-7.0.33/ext/intl/calendar/calendar_class.h
+--- php-7.0.33.org/ext/intl/calendar/calendar_class.h 2018-12-04 18:22:53.000000000 +0100
++++ php-7.0.33/ext/intl/calendar/calendar_class.h 2021-08-23 23:37:07.399084984 +0200
@@ -26,6 +26,8 @@
#ifndef USE_CALENDAR_POINTER
#endif
typedef struct {
---- php-5.5.38.orig/ext/intl/calendar/calendar_methods.cpp 2016-07-20 10:41:48.000000000 +0200
-+++ php-5.5.38/ext/intl/calendar/calendar_methods.cpp 2019-04-18 09:21:37.634177141 +0200
-@@ -40,6 +40,8 @@
+diff -urNp -x '*.orig' php-7.0.33.org/ext/intl/calendar/calendar_methods.cpp php-7.0.33/ext/intl/calendar/calendar_methods.cpp
+--- php-7.0.33.org/ext/intl/calendar/calendar_methods.cpp 2018-12-04 18:22:53.000000000 +0100
++++ php-7.0.33/ext/intl/calendar/calendar_methods.cpp 2021-08-23 23:37:07.402418347 +0200
+@@ -40,6 +40,8 @@ extern "C" {
}
#include "../common/common_enum.h"
U_CFUNC PHP_METHOD(IntlCalendar, __construct)
{
zend_throw_exception( NULL,
---- php-5.5.38.orig/ext/intl/calendar/gregoriancalendar_methods.cpp 2016-07-20 10:41:48.000000000 +0200
-+++ php-5.5.38/ext/intl/calendar/gregoriancalendar_methods.cpp 2019-04-18 09:23:00.341851246 +0200
-@@ -32,6 +32,11 @@
- #include <ext/date/php_date.h>
+diff -urNp -x '*.orig' php-7.0.33.org/ext/intl/calendar/gregoriancalendar_methods.cpp php-7.0.33/ext/intl/calendar/gregoriancalendar_methods.cpp
+--- php-7.0.33.org/ext/intl/calendar/gregoriancalendar_methods.cpp 2018-12-04 18:22:53.000000000 +0100
++++ php-7.0.33/ext/intl/calendar/gregoriancalendar_methods.cpp 2021-08-23 23:37:07.402418347 +0200
+@@ -34,6 +34,11 @@ extern "C" {
+ #include "zend_exceptions.h"
}
+using icu::GregorianCalendar;
static inline GregorianCalendar *fetch_greg(Calendar_object *co) {
return (GregorianCalendar*)co->ucal;
}
---- php-5.5.38.orig/ext/intl/common/common_date.cpp 2016-07-20 10:41:48.000000000 +0200
-+++ php-5.5.38/ext/intl/common/common_date.cpp 2019-04-18 08:53:40.357013115 +0200
+diff -urNp -x '*.orig' php-7.0.33.org/ext/intl/common/common_date.cpp php-7.0.33/ext/intl/common/common_date.cpp
+--- php-7.0.33.org/ext/intl/common/common_date.cpp 2018-12-04 18:22:53.000000000 +0100
++++ php-7.0.33/ext/intl/common/common_date.cpp 2021-08-23 23:37:07.402418347 +0200
@@ -17,6 +17,8 @@
- #include "../ext/intl_cppshims.h"
+ #include "../intl_cppshims.h"
#include <unicode/calendar.h>
+using icu::TimeZone;
extern "C" {
#include "../php_intl.h"
---- php-5.5.38.orig/ext/intl/common/common_date.h 2016-07-20 10:41:48.000000000 +0200
-+++ php-5.5.38/ext/intl/common/common_date.h 2019-04-18 09:04:53.802375635 +0200
-@@ -27,6 +27,7 @@
+diff -urNp -x '*.orig' php-7.0.33.org/ext/intl/common/common_date.h php-7.0.33/ext/intl/common/common_date.h
+--- php-7.0.33.org/ext/intl/common/common_date.h 2018-12-04 18:22:53.000000000 +0100
++++ php-7.0.33/ext/intl/common/common_date.h 2021-08-23 23:37:07.402418347 +0200
+@@ -27,6 +27,7 @@ U_CDECL_END
#ifdef __cplusplus
#include <unicode/timezone.h>
+using icu::TimeZone;
- U_CFUNC TimeZone *timezone_convert_datetimezone(int type, void *object, int is_datetime, intl_error *outside_error, const char *func TSRMLS_DC);
+ U_CFUNC TimeZone *timezone_convert_datetimezone(int type, void *object, int is_datetime, intl_error *outside_error, const char *func);
U_CFUNC int intl_datetime_decompose(zval *z, double *millis, TimeZone **tz,
---- php-5.5.38.orig/ext/intl/common/common_enum.h 2016-07-20 10:41:48.000000000 +0200
-+++ php-5.5.38/ext/intl/common/common_enum.h 2019-04-18 08:50:49.214683321 +0200
-@@ -69,6 +69,7 @@
+diff -urNp -x '*.orig' php-7.0.33.org/ext/intl/common/common_enum.h php-7.0.33/ext/intl/common/common_enum.h
+--- php-7.0.33.org/ext/intl/common/common_enum.h 2018-12-04 18:22:53.000000000 +0100
++++ php-7.0.33/ext/intl/common/common_enum.h 2021-08-23 23:37:07.402418347 +0200
+@@ -75,6 +75,7 @@ U_CFUNC zval *zoi_with_current_get_curre
U_CFUNC void zoi_with_current_invalidate_current(zend_object_iterator *iter);
#ifdef __cplusplus
U_CFUNC void IntlIterator_from_StringEnumeration(StringEnumeration *se, zval *object);
#endif
---- php-5.5.38.orig/ext/intl/dateformat/dateformat_format_object.cpp 2016-07-20 10:41:48.000000000 +0200
-+++ php-5.5.38/ext/intl/dateformat/dateformat_format_object.cpp 2019-04-18 08:55:34.509673920 +0200
-@@ -33,6 +33,12 @@
+diff -urNp -x '*.orig' php-7.0.33.org/ext/intl/dateformat/dateformat_format_object.cpp php-7.0.33/ext/intl/dateformat/dateformat_format_object.cpp
+--- php-7.0.33.org/ext/intl/dateformat/dateformat_format_object.cpp 2018-12-04 18:22:53.000000000 +0100
++++ php-7.0.33/ext/intl/dateformat/dateformat_format_object.cpp 2021-08-23 23:37:07.402418347 +0200
+@@ -33,6 +33,12 @@ extern "C" {
#include "../common/common_date.h"
}
static const DateFormat::EStyle valid_styles[] = {
DateFormat::kNone,
DateFormat::kFull,
---- php-5.5.38.orig/ext/intl/dateformat/dateformat_helpers.h 2016-07-20 10:41:48.000000000 +0200
-+++ php-5.5.38/ext/intl/dateformat/dateformat_helpers.h 2019-04-18 09:07:05.049267391 +0200
-@@ -22,11 +22,18 @@
- #endif
+diff -urNp -x '*.orig' php-7.0.33.org/ext/intl/dateformat/dateformat_helpers.cpp php-7.0.33/ext/intl/dateformat/dateformat_helpers.cpp
+--- php-7.0.33.org/ext/intl/dateformat/dateformat_helpers.cpp 2018-12-04 18:22:53.000000000 +0100
++++ php-7.0.33/ext/intl/dateformat/dateformat_helpers.cpp 2021-08-23 23:37:07.402418347 +0200
+@@ -28,6 +28,8 @@ extern "C" {
+ #include "../calendar/calendar_class.h"
+ }
- #include <unicode/calendar.h>
++using icu::GregorianCalendar;
+
-+#include <unicode/datefmt.h>
+ int datefmt_process_calendar_arg(zval* calendar_zv,
+ Locale const& locale,
+ const char *func_name,
+diff -urNp -x '*.orig' php-7.0.33.org/ext/intl/dateformat/dateformat_helpers.h php-7.0.33/ext/intl/dateformat/dateformat_helpers.h
+--- php-7.0.33.org/ext/intl/dateformat/dateformat_helpers.h 2018-12-04 18:22:53.000000000 +0100
++++ php-7.0.33/ext/intl/dateformat/dateformat_helpers.h 2021-08-23 23:37:07.402418347 +0200
+@@ -23,10 +23,17 @@
+ #include <unicode/calendar.h>
+
++#include <unicode/datefmt.h>
++
extern "C" {
#include "../php_intl.h"
}
int datefmt_process_calendar_arg(zval* calendar_zv,
Locale const& locale,
const char *func_name,
---- php-5.5.38.orig/ext/intl/intl_convertcpp.h 2016-07-20 10:41:48.000000000 +0200
-+++ php-5.5.38/ext/intl/intl_convertcpp.h 2019-04-18 08:49:50.358252987 +0200
-@@ -24,6 +24,7 @@
+diff -urNp -x '*.orig' php-7.0.33.org/ext/intl/intl_convertcpp.h php-7.0.33/ext/intl/intl_convertcpp.h
+--- php-7.0.33.org/ext/intl/intl_convertcpp.h 2018-12-04 18:22:53.000000000 +0100
++++ php-7.0.33/ext/intl/intl_convertcpp.h 2021-08-23 23:37:07.402418347 +0200
+@@ -25,6 +25,7 @@
#include <unicode/unistr.h>
#include <zend_types.h>
+using icu::UnicodeString;
- int intl_stringFromChar(UnicodeString &ret, char *str, int32_t str_len, UErrorCode *status);
+ int intl_stringFromChar(UnicodeString &ret, char *str, size_t str_len, UErrorCode *status);
---- php-5.5.38.orig/ext/intl/msgformat/msgformat_helpers.cpp 2016-07-20 10:41:48.000000000 +0200
-+++ php-5.5.38/ext/intl/msgformat/msgformat_helpers.cpp 2019-04-18 09:00:43.482564710 +0200
+diff -urNp -x '*.orig' php-7.0.33.org/ext/intl/msgformat/msgformat_helpers.cpp php-7.0.33/ext/intl/msgformat/msgformat_helpers.cpp
+--- php-7.0.33.org/ext/intl/msgformat/msgformat_helpers.cpp 2018-12-04 18:22:54.000000000 +0100
++++ php-7.0.33/ext/intl/msgformat/msgformat_helpers.cpp 2021-08-23 23:37:07.402418347 +0200
@@ -27,6 +27,7 @@
#include <unicode/timezone.h>
#include <unicode/datefmt.h>
#include <vector>
-@@ -76,6 +77,16 @@
+@@ -76,6 +77,16 @@ MessageFormatAdapter::getMessagePattern(
#endif
U_NAMESPACE_END
U_CFUNC int32_t umsg_format_arg_count(UMessageFormat *fmt)
{
int32_t fmt_count = 0;
---- php-5.5.38.orig/ext/intl/timezone/timezone_class.cpp 2016-07-20 10:41:48.000000000 +0200
-+++ php-5.5.38/ext/intl/timezone/timezone_class.cpp 2019-04-18 09:01:40.738904566 +0200
-@@ -37,6 +37,8 @@
+diff -urNp -x '*.orig' php-7.0.33.org/ext/intl/timezone/timezone_class.cpp php-7.0.33/ext/intl/timezone/timezone_class.cpp
+--- php-7.0.33.org/ext/intl/timezone/timezone_class.cpp 2018-12-04 18:22:53.000000000 +0100
++++ php-7.0.33/ext/intl/timezone/timezone_class.cpp 2021-08-23 23:37:07.402418347 +0200
+@@ -37,6 +37,8 @@ extern "C" {
#include <ext/date/php_date.h>
}
/* {{{ Global variables */
U_CDECL_BEGIN
zend_class_entry *TimeZone_ce_ptr = NULL;
---- php-5.5.38.orig/ext/intl/timezone/timezone_class.h 2016-07-20 10:41:48.000000000 +0200
-+++ php-5.5.38/ext/intl/timezone/timezone_class.h 2019-04-18 08:58:02.620784547 +0200
+diff -urNp -x '*.orig' php-7.0.33.org/ext/intl/timezone/timezone_class.h php-7.0.33/ext/intl/timezone/timezone_class.h
+--- php-7.0.33.org/ext/intl/timezone/timezone_class.h 2018-12-04 18:22:53.000000000 +0100
++++ php-7.0.33/ext/intl/timezone/timezone_class.h 2021-08-23 23:37:07.402418347 +0200
@@ -29,6 +29,8 @@
#ifndef USE_TIMEZONE_POINTER
#endif
typedef struct {
---- php-5.5.38.orig/ext/intl/timezone/timezone_methods.cpp 2016-07-20 10:41:48.000000000 +0200
-+++ php-5.5.38/ext/intl/timezone/timezone_methods.cpp 2019-04-18 09:20:17.116617981 +0200
+diff -urNp -x '*.orig' php-7.0.33.org/ext/intl/timezone/timezone_methods.cpp php-7.0.33/ext/intl/timezone/timezone_methods.cpp
+--- php-7.0.33.org/ext/intl/timezone/timezone_methods.cpp 2018-12-04 18:22:53.000000000 +0100
++++ php-7.0.33/ext/intl/timezone/timezone_methods.cpp 2021-08-23 23:37:07.402418347 +0200
@@ -23,6 +23,7 @@
#include <unicode/locid.h>
#include <unicode/timezone.h>
#include "intl_convertcpp.h"
#include "../common/common_date.h"
-@@ -37,6 +38,9 @@
+@@ -37,6 +38,9 @@ extern "C" {
}
#include "common/common_enum.h"
U_CFUNC PHP_METHOD(IntlTimeZone, __construct)
{
zend_throw_exception( NULL,
-
---- php-7.0.33/ext/intl/dateformat/dateformat_helpers.cpp~ 2018-12-04 18:22:53.000000000 +0100
-+++ php-7.0.33/ext/intl/dateformat/dateformat_helpers.cpp 2019-10-19 21:29:32.416045611 +0200
-@@ -28,6 +28,8 @@ extern "C" {
- #include "../calendar/calendar_class.h"
- }
-
-+using icu::GregorianCalendar;
-+
- int datefmt_process_calendar_arg(zval* calendar_zv,
- Locale const& locale,
- const char *func_name,
---- php-7.0.12/php.ini~ 2016-10-14 17:03:05.000000000 +0300
-+++ php-7.0.12/php.ini 2016-10-14 17:04:24.894309139 +0300
+diff -urNp -x '*.orig' php-7.0.33.org/php.ini php-7.0.33/php.ini
+--- php-7.0.33.org/php.ini 2018-12-04 18:22:44.000000000 +0100
++++ php-7.0.33/php.ini 2021-08-23 23:35:50.761029643 +0200
@@ -82,6 +82,20 @@
- ; much more verbose when it comes to errors. We recommending using the
- ; development version only in development environments as errors shown to
+ ; much more verbose when it comes to errors. We recommend using the
+ ; development version only in development environments, as errors shown to
; application users can inadvertently leak otherwise secure information.
+;
+; This is the default settings file for new PHP installations from
+; few options)
+
- ;;;;;;;;;;;;;;;;;;;
- ; Quick Reference ;
-@@ -198,7 +212,7 @@
+ ; This is php.ini-production INI file.
+
+@@ -175,7 +189,7 @@
;user_ini.filename = ".user.ini"
; To disable this feature set this option to empty value
; TTL for user-defined php.ini files (time-to-live) in seconds. Default is 300 seconds (5 minutes)
;user_ini.cache_ttl = 300
-@@ -223,7 +237,7 @@
+@@ -199,7 +213,7 @@ engine = On
; Development Value: Off
; Production Value: Off
; http://php.net/short-open-tag
-short_open_tag = Off
+short_open_tag = On
- ; Allow ASP-style <% %> tags.
- ; http://php.net/asp-tags
-@@ -372,7 +372,7 @@
+ ; The number of significant digits displayed in floating point numbers.
+ ; http://php.net/precision
+@@ -356,7 +370,7 @@ zend.enable_gc = On
; threat in any way, but it makes it possible to determine whether you use PHP
; on your server or not.
; http://php.net/expose-php
;;;;;;;;;;;;;;;;;;;
; Resource Limits ;
-@@ -725,7 +725,7 @@
+@@ -718,7 +732,7 @@ user_dir =
; Directory in which the loadable extensions (modules) reside.
; http://php.net/extension-dir
; On windows:
; extension_dir = "ext"
-@@ -746,65 +746,6 @@
+@@ -732,65 +746,6 @@ user_dir =
; http://php.net/enable-dl
enable_dl = Off
;;;;;;;;;;;;;;;;
; File Uploads ;
;;;;;;;;;;;;;;;;
-@@ -823,47 +823,8 @@
+@@ -868,47 +823,8 @@ default_socket_timeout = 60
; If you only provide the name of the extension, PHP will look for it in its
; default extension directory.
;
;;;;;;;;;;;;;;;;;;;
; Module Settings ;
-@@ -964,19 +876,19 @@
+@@ -946,19 +862,19 @@ cli_server.color = On
; Use of this INI entry is deprecated, use global input_encoding instead.
; If empty, default_charset or input_encoding or iconv.input_encoding is used.
; The precedence is: default_charset < intput_encoding < iconv.input_encoding
[intl]
;intl.default_locale =
-@@ -1191,6 +1104,9 @@
+@@ -1154,6 +1070,9 @@ mysqli.default_port = 3306
; http://php.net/mysqli.default-socket
mysqli.default_socket =
; Default host for mysql_connect() (doesn't apply in safe mode).
; http://php.net/mysqli.default-host
mysqli.default_host =
-@@ -1357,7 +1273,7 @@
+@@ -1303,7 +1222,7 @@ bcmath.scale = 0
[browscap]
; http://php.net/browscap
[Session]
; Handler used to store/retrieve data.
-@@ -1822,7 +1738,7 @@
+@@ -1730,7 +1649,7 @@ soap.wsdl_cache_enabled=1
; Sets the directory name where SOAP extension will put cache files.
; http://php.net/soap.wsdl-cache-dir
---- php-5.3.1/configure.in~ 2010-02-19 23:26:13.000000000 +0200
-+++ php-5.3.1/configure.in 2010-02-19 23:27:58.273207305 +0200
-@@ -934,11 +934,6 @@
+diff -urNp -x '*.orig' php-7.0.33.org/configure.in php-7.0.33/configure.in
+--- php-7.0.33.org/configure.in 2021-08-23 23:36:10.981626855 +0200
++++ php-7.0.33/configure.in 2021-08-23 23:36:11.958315612 +0200
+@@ -1091,11 +1091,6 @@ if test -z "$with_pear" && test "$enable
with_pear=no
fi
-fi
-
PHP_ARG_WITH(pear, [whether to install PEAR],
- [ --with-pear=DIR Install PEAR in DIR [PREFIX/lib/php]
+ [ --with-pear=DIR Install PEAR in DIR @<:@PREFIX/lib/php@:>@
--without-pear Do not install PEAR], DEFAULT, yes)
-@@ -1023,11 +1023,11 @@
+@@ -1105,11 +1100,11 @@ if test "$PHP_PEAR" != "no"; then
dnl
dnl PEAR dependancies
dnl
dnl
dnl if test "$PHP_XMLRPC" = "no"; then
dnl pear_error_msg="$pear_error_msg
---- php-5.2.6/sapi/cli/config.m4~ 2008-11-16 18:35:31.000000000 +0200
-+++ php-5.2.6/sapi/cli/config.m4 2008-11-20 19:04:12.585061299 +0200
-@@ -4,7 +4,7 @@
+diff -urNp -x '*.orig' php-7.0.33.org/sapi/cli/config.m4 php-7.0.33/sapi/cli/config.m4
+--- php-7.0.33.org/sapi/cli/config.m4 2021-08-23 23:36:10.981626855 +0200
++++ php-7.0.33/sapi/cli/config.m4 2021-08-23 23:36:11.961649021 +0200
+@@ -4,7 +4,7 @@ dnl
PHP_ARG_ENABLE(cli,,
[ --disable-cli Disable building CLI version of PHP
- (this forces --without-pear)], yes, no)
+ ], yes, no)
- AC_MSG_CHECKING(for CLI build)
- if test "$PHP_CLI" != "no"; then
+ AC_CHECK_FUNCS(setproctitle)
+
---- php-7.0/ext/standard/info.c~ 2015-05-21 17:57:06.000000000 +0300
-+++ php-7.0/ext/standard/info.c 2015-05-21 22:56:10.367595637 +0300
-@@ -651,6 +651,20 @@
+diff -urNp -x '*.orig' php-7.0.33.org/ext/standard/info.c php-7.0.33/ext/standard/info.c
+--- php-7.0.33.org/ext/standard/info.c 2018-12-04 18:22:44.000000000 +0100
++++ php-7.0.33/ext/standard/info.c 2021-08-23 23:35:32.086776885 +0200
+@@ -861,6 +861,20 @@ PHPAPI void php_print_info(int flag)
php_info_print_table_row(2, "PHP Version", PHP_VERSION);
}
php_info_print_box_end();
+ php_info_print_box_end();
+
php_info_print_table_start();
- php_info_print_table_row(2, "System", php_uname->val);
+ php_info_print_table_row(2, "System", ZSTR_VAL(php_uname));
php_info_print_table_row(2, "Build Date", __DATE__ " " __TIME__);
---- php-5.6.0beta1/ext/standard/info.h~ 2014-04-10 08:11:48.000000000 +0300
-+++ php-5.6.0beta1/ext/standard/info.h 2014-04-21 21:37:12.184288611 +0300
+diff -urNp -x '*.orig' php-7.0.33.org/ext/standard/info.h php-7.0.33/ext/standard/info.h
+--- php-7.0.33.org/ext/standard/info.h 2018-12-04 18:22:44.000000000 +0100
++++ php-7.0.33/ext/standard/info.h 2021-08-23 23:35:32.086776885 +0200
@@ -54,6 +54,7 @@
#define PHP_LOGO_DATA_URI "data:image/png;base64,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"
- #define PHP_EGG_LOGO_DATA_URI "data:image/gif;base64,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"
+ #define PHP_EGG_LOGO_DATA_URI "data:image/png;base64,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"
#define ZEND_LOGO_DATA_URI "data:image/png;base64,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"
+#define PLD_LOGO_DATA_URI "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAAAyCAMAAAD886zOAAACLlBMVEXAwMAAAGMAAGEAAGAAAF8AAF4AAF0AAFsCAmIGBmYGBmULC2UODm8PD2cQEGsVFW8aGm8bG3AcHHMbG20dHXIeHnIfH3MiInckJHgjI3UkJHckJHUmJngoKHkqKnsqKnopKXYqKngsLH0vL4AuLngxMXw1NYI3N4U7O4U/P4o9PYY8PIM6On1AQIk/P4c8PIE9PYFBQYdDQ4pAQINFRYxHR41GRotGRolGRohHR4lERINMTI5PT5JOTo9PT5BPT49KSoZKSoVTU5NZWZpSUo1aWppaWplYWJZbW5laWpddXZhiYp9gYJxbW5RgYJteXphYWI5ZWY9kZKBdXZNnZ6JlZZ9cXJBgYJVqaqRiYphgYJRsbKVqaqJlZZpmZptnZ5xvb6dnZ5twcKdoaJtwcKR0dKhtbZx2dqh/f7F9fa59fa1vb5p/f698fKuAgLCJibiJibeAgKt9faaMjLl+fqeJibSPj7mNjbeSkryQkLmUlL2Kiq+Jia6UlLuVlbmensOdncGZmbukpMempsmlpcicnLybm7ugoMCrq8ypqcqqqsqxsdGenruurs2mpsOtrcutrcqpqcWnp8KoqMK4uNStrca7u9W5udK3t9C9vdbCwtq9vdW4uM+3t87Dw9rHx97IyN7ExNnGxtrCwta8vM/MzODFxdfR0ePQ0OLPz+HOzuDNzd/Q0OHNzd7ExNTT0+POzt7V1eXR0eDY2OfU1OPKytjb2+nZ2efMzNni4uuYJsmBAAAAAXRSTlMAQObYZgAAAAFiS0dEuTq4FmAAAAI5SURBVHjaY2AYnCDDz1y0n4rmFXutZQiUpJ55+dJAYoYK9QzkCQMSndnUMxDs2aQeqpmnXAIkOmSoZp5zFIjMTKGWed3GIHKW7DxqGSg2HUQaNVDLPPE+EBnURi3zNGtAZLMWtcyb7wKmlGqpZaAEmEwqpJZ53tVgyoxa5m1zB1Ouk6hlYMUWEDnFAki0UMXAnWBSPZGBYSa7E7VcyRDB2Qokfdk0qGTeCvm0IhAdzipFHQObYOVqMJs1VQwMcYCxVFnmUsPA6AAYax2zHDUMTDCAMyNZp1LBwFJeBJvDkgoGTmDeAWfbMlHDz0zxcOZElslUMNCfZRmczZVMDScK8EEZCzZ4ChKriRFOYIKt3PwrwYyFce0cIGVAQJGBDAyOOpUbQbRhoxBUGUET8RsIBEtARG6sHtxAsDMRCExBGXA/MMIUYTF60WwgsVjRHmYg1FSogRACiYdwIVwEDdSngkgRbZi9MAOhEC6EkCNgYJkJiLTTR1cLdxgDhjn4DawyBZHpCvDwYGRkRNILcxg0aFHCEHvkdMWAyHJhgukFZ5Sjgd5QEDndilrmMazOAlM1ZLkQG1jjBqbmQEOGEZbkkPgw9zAiUzjBNB8wtYkBnnaRDETRT0S+BIGVOahOQDcQYQ6SC+FuR9YCld/sQZ6BDAhDkBMUA8P2PLIMZMBp4OYCJAPRI4V4AxHKlusuRQ91yly4yga/gRixjGEgI6qBDGodmAYyMqLEJYowuk9RBRkY1tcRlbrIAADaI0jmkAFRKgAAAABJRU5ErkJggg=="
---- php-5.4.0alpha2/sapi/cli/config.m4~ 2011-08-05 12:59:18.000000000 +0300
-+++ php-5.4.0alpha2/sapi/cli/config.m4 2011-08-05 13:23:40.356628679 +0300
-@@ -31,7 +31,7 @@
- BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_BINARY_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -Lnetware -lphp5lib -o \$(SAPI_CLI_PATH)"
+diff -urNp -x '*.orig' php-7.0.33.org/sapi/cli/config.m4 php-7.0.33/sapi/cli/config.m4
+--- php-7.0.33.org/sapi/cli/config.m4 2021-08-23 23:35:54.567833117 +0200
++++ php-7.0.33/sapi/cli/config.m4 2021-08-23 23:35:55.487864203 +0200
+@@ -48,7 +48,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_BINARY_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -Lnetware -lphp7lib -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_BINARY_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
---- php-7.0.0RC3/configure.in~ 2015-09-26 14:55:35.000000000 +0300
-+++ php-7.0.0RC3/configure.in 2015-09-26 15:13:29.581882625 +0300
-@@ -224,6 +224,9 @@
- dnl check for -R, etc. switch
- PHP_RUNPATH_SWITCH
+diff -urNp -x '*.orig' php-7.0.33.org/Makefile.global php-7.0.33/Makefile.global
+--- php-7.0.33.org/Makefile.global 2018-12-04 18:22:44.000000000 +0100
++++ php-7.0.33/Makefile.global 2021-08-23 23:35:29.816640040 +0200
+@@ -15,8 +15,12 @@ build-modules: $(PHP_MODULES) $(PHP_ZEND
-+dnl Always shared
-+PHP_BUILD_SHARED
-+
- dnl Checks for some support/generator progs
- PHP_PROG_AWK
- PHP_PROG_BISON
---- 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 @@
-
- build-modules: $(PHP_MODULES)
+ build-binaries: $(PHP_BINARIES)
-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 @@
+@@ -27,10 +31,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-7.0.0beta1/sapi/cgi/config9.m4~ 2015-07-10 15:11:43.000000000 +0300
-+++ php-7.0.0beta1/sapi/cgi/config9.m4 2015-07-13 16:03:06.900955209 +0300
-@@ -64,7 +64,7 @@
+diff -urNp -x '*.orig' php-7.0.33.org/configure.in php-7.0.33/configure.in
+--- php-7.0.33.org/configure.in 2018-12-04 18:22:44.000000000 +0100
++++ php-7.0.33/configure.in 2021-08-23 23:35:29.816640040 +0200
+@@ -224,6 +224,9 @@ PHP_ARG_ENABLE(rpath, whether to enable
+ dnl check for -R, etc. switch
+ PHP_RUNPATH_SWITCH
+
++dnl Always shared
++PHP_BUILD_SHARED
++
+ dnl Checks for some support/generator progs
+ PHP_PROG_AWK
+ PHP_PROG_BISON
+diff -urNp -x '*.orig' php-7.0.33.org/sapi/cgi/Makefile.frag php-7.0.33/sapi/cgi/Makefile.frag
+--- php-7.0.33.org/sapi/cgi/Makefile.frag 2018-12-04 18:23:01.000000000 +0100
++++ php-7.0.33/sapi/cgi/Makefile.frag 2021-08-23 23:35:29.816640040 +0200
+@@ -1,6 +1,6 @@
+ cgi: $(SAPI_CGI_PATH)
+
+-$(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_FASTCGI_OBJS) $(PHP_CGI_OBJS)
++$(SAPI_CGI_PATH): libphp_common.la $(PHP_BINARY_OBJS) $(PHP_FASTCGI_OBJS) $(PHP_CGI_OBJS)
+ $(BUILD_CGI)
+
+ install-cgi: $(SAPI_CGI_PATH)
+diff -urNp -x '*.orig' php-7.0.33.org/sapi/cgi/config9.m4 php-7.0.33/sapi/cgi/config9.m4
+--- php-7.0.33.org/sapi/cgi/config9.m4 2018-12-04 18:23:01.000000000 +0100
++++ php-7.0.33/sapi/cgi/config9.m4 2021-08-23 23:35:29.816640040 +0200
+@@ -64,7 +64,7 @@ if test "$PHP_CGI" != "no"; then
BUILD_CGI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_FASTCGI_OBJS:.lo=.o) \$(PHP_CGI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
;;
*)
;;
esac
---- php-7.0.0beta1/sapi/cgi/Makefile.frag~ 2015-07-10 15:11:43.000000000 +0300
-+++ php-7.0.0beta1/sapi/cgi/Makefile.frag 2015-07-13 16:03:56.810212555 +0300
+diff -urNp -x '*.orig' php-7.0.33.org/sapi/cli/Makefile.frag php-7.0.33/sapi/cli/Makefile.frag
+--- php-7.0.33.org/sapi/cli/Makefile.frag 2018-12-04 18:23:02.000000000 +0100
++++ php-7.0.33/sapi/cli/Makefile.frag 2021-08-23 23:35:29.816640040 +0200
@@ -1,6 +1,6 @@
- cgi: $(SAPI_CGI_PATH)
+ cli: $(SAPI_CLI_PATH)
--$(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_FASTCGI_OBJS) $(PHP_CGI_OBJS)
-+$(SAPI_CGI_PATH): libphp_common.la $(PHP_BINARY_OBJS) $(PHP_FASTCGI_OBJS) $(PHP_CGI_OBJS)
- $(BUILD_CGI)
+-$(SAPI_CLI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_CLI_OBJS)
++$(SAPI_CLI_PATH): libphp_common.la $(PHP_BINARY_OBJS) $(PHP_CLI_OBJS)
+ $(BUILD_CLI)
- install-cgi: $(SAPI_CGI_PATH)
---- php-5.4.0alpha2/sapi/cli/config.m4~ 2011-06-20 23:27:39.000000000 +0300
-+++ php-5.4.0alpha2/sapi/cli/config.m4 2011-08-01 10:34:01.072624745 +0300
-@@ -31,7 +31,7 @@
- BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_BINARY_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -Lnetware -lphp5lib -o \$(SAPI_CLI_PATH)"
+ install-cli: $(SAPI_CLI_PATH)
+diff -urNp -x '*.orig' php-7.0.33.org/sapi/cli/config.m4 php-7.0.33/sapi/cli/config.m4
+--- php-7.0.33.org/sapi/cli/config.m4 2018-12-04 18:23:02.000000000 +0100
++++ php-7.0.33/sapi/cli/config.m4 2021-08-23 23:35:29.816640040 +0200
+@@ -48,7 +48,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_BINARY_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -Lnetware -lphp7lib -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_BINARY_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
;;
esac
---- php-5.4.0alpha2/sapi/cli/Makefile.frag~ 2011-01-24 00:40:35.000000000 +0200
-+++ php-5.4.0alpha2/sapi/cli/Makefile.frag 2011-08-01 12:22:28.627926487 +0300
+diff -urNp -x '*.orig' php-7.0.33.org/sapi/litespeed/Makefile.frag php-7.0.33/sapi/litespeed/Makefile.frag
+--- php-7.0.33.org/sapi/litespeed/Makefile.frag 2018-12-04 18:23:02.000000000 +0100
++++ php-7.0.33/sapi/litespeed/Makefile.frag 2021-08-23 23:35:29.816640040 +0200
@@ -1,6 +1,6 @@
- cli: $(SAPI_CLI_PATH)
+ litespeed: $(SAPI_LITESPEED_PATH)
--$(SAPI_CLI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_CLI_OBJS)
-+$(SAPI_CLI_PATH): libphp_common.la $(PHP_BINARY_OBJS) $(PHP_CLI_OBJS)
- $(BUILD_CLI)
+-$(SAPI_LITESPEED_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_LITESPEED_OBJS)
++$(SAPI_LITESPEED_PATH): libphp_common.la $(PHP_BINARY_OBJS) $(PHP_LITESPEED_OBJS)
+ $(BUILD_LITESPEED)
- install-cli: $(SAPI_CLI_PATH)
---- php-7.0.0RC3/sapi/phpdbg/Makefile.frag~ 2015-09-16 15:49:38.000000000 +0300
-+++ php-7.0.0RC3/sapi/phpdbg/Makefile.frag 2015-09-27 21:24:44.370536565 +0300
-@@ -2,10 +2,10 @@
+ install-litespeed: $(SAPI_LITESPEED_PATH)
+diff -urNp -x '*.orig' php-7.0.33.org/sapi/litespeed/config.m4 php-7.0.33/sapi/litespeed/config.m4
+--- php-7.0.33.org/sapi/litespeed/config.m4 2018-12-04 18:23:02.000000000 +0100
++++ php-7.0.33/sapi/litespeed/config.m4 2021-08-23 23:35:29.816640040 +0200
+@@ -17,10 +17,10 @@ if test "$PHP_LITESPEED" != "no"; then
+ ;;
+ *cygwin*)
+ SAPI_LITESPEED_PATH=sapi/litespeed/php.exe
+- BUILD_LITESPEED="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_LITESPEED_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_LITESPEED_PATH)"
++ BUILD_LITESPEED="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) libphp_common.la \$(PHP_BINARY_OBJS) \$(PHP_LITESPEED_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_LITESPEED_PATH)"
+ ;;
+ *)
+- BUILD_LITESPEED="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_LITESPEED_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_LITESPEED_PATH)"
++ BUILD_LITESPEED="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) libphp_common.la \$(PHP_BINARY_OBJS) \$(PHP_LITESPEED_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_LITESPEED_PATH)"
+ ;;
+ esac
+
+diff -urNp -x '*.orig' php-7.0.33.org/sapi/phpdbg/Makefile.frag php-7.0.33/sapi/phpdbg/Makefile.frag
+--- php-7.0.33.org/sapi/phpdbg/Makefile.frag 2018-12-04 18:23:02.000000000 +0100
++++ php-7.0.33/sapi/phpdbg/Makefile.frag 2021-08-23 23:35:29.816640040 +0200
+@@ -2,10 +2,10 @@ phpdbg: $(BUILD_BINARY)
phpdbg-shared: $(BUILD_SHARED)
$(BUILD_PHPDBG)
%.c: %.y
---- php-7.0.0RC3/sapi/phpdbg/config.m4~ 2015-09-16 15:49:38.000000000 +0300
-+++ php-7.0.0RC3/sapi/phpdbg/config.m4 2015-09-27 21:25:34.413134698 +0300
-@@ -40,7 +40,7 @@
+diff -urNp -x '*.orig' php-7.0.33.org/sapi/phpdbg/config.m4 php-7.0.33/sapi/phpdbg/config.m4
+--- php-7.0.33.org/sapi/phpdbg/config.m4 2018-12-04 18:23:02.000000000 +0100
++++ php-7.0.33/sapi/phpdbg/config.m4 2021-08-23 23:35:29.816640040 +0200
+@@ -40,7 +40,7 @@ if test "$BUILD_PHPDBG" = "" && test "$P
BUILD_PHPDBG="\$(LIBTOOL) --mode=link \
\$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \
\$(PHP_BINARY_OBJS) \
\$(PHP_PHPDBG_OBJS) \
\$(EXTRA_LIBS) \
-@@ -50,7 +50,7 @@
+@@ -50,7 +50,7 @@ if test "$BUILD_PHPDBG" = "" && test "$P
BUILD_PHPDBG_SHARED="\$(LIBTOOL) --mode=link \
\$(CC) -shared -Wl,-soname,libphpdbg.so -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \
\$(PHP_BINARY_OBJS) \
\$(PHP_PHPDBG_OBJS) \
\$(EXTRA_LIBS) \
---- php-7.0.0RC3/sapi/litespeed/Makefile.frag~ 2015-09-16 15:49:38.000000000 +0300
-+++ php-7.0.0RC3/sapi/litespeed/Makefile.frag 2015-09-27 21:26:36.783039512 +0300
-@@ -1,6 +1,6 @@
- litespeed: $(SAPI_LITESPEED_PATH)
-
--$(SAPI_LITESPEED_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_LITESPEED_OBJS)
-+$(SAPI_LITESPEED_PATH): libphp_common.la $(PHP_BINARY_OBJS) $(PHP_LITESPEED_OBJS)
- $(BUILD_LITESPEED)
-
- install-litespeed: $(SAPI_LITESPEED_PATH)
---- php-7.0.0RC3/sapi/litespeed/config.m4~ 2015-09-16 15:49:38.000000000 +0300
-+++ php-7.0.0RC3/sapi/litespeed/config.m4 2015-09-27 21:27:36.182790123 +0300
-@@ -17,10 +17,10 @@
- ;;
- *cygwin*)
- SAPI_LITESPEED_PATH=sapi/litespeed/php.exe
-- BUILD_LITESPEED="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_LITESPEED_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_LITESPEED_PATH)"
-+ BUILD_LITESPEED="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) libphp_common.la \$(PHP_BINARY_OBJS) \$(PHP_LITESPEED_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_LITESPEED_PATH)"
- ;;
- *)
-- BUILD_LITESPEED="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_LITESPEED_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_LITESPEED_PATH)"
-+ BUILD_LITESPEED="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) libphp_common.la \$(PHP_BINARY_OBJS) \$(PHP_LITESPEED_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_LITESPEED_PATH)"
- ;;
- esac
-
link core php with -lz for getimagesize()
see also http://bugs.php.net/bug.php?id=29611
---- php-7.0/ext/standard/image.c~ 2015-05-21 23:10:45.000000000 +0300
-+++ php-7.0/ext/standard/image.c 2015-05-21 23:11:22.424948534 +0300
-@@ -31,7 +31,7 @@
+diff -urNp -x '*.orig' php-7.0.33.org/ext/standard/image.c php-7.0.33/ext/standard/image.c
+--- php-7.0.33.org/ext/standard/image.c 2018-12-04 18:22:44.000000000 +0100
++++ php-7.0.33/ext/standard/image.c 2021-08-23 23:36:07.194869598 +0200
+@@ -34,7 +34,7 @@
+ #include "win32/php_stdint.h"
#endif
- #include "php_image.h"
-#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB)
+#if HAVE_ZLIB
#include "zlib.h"
#endif
-@@ -80,7 +80,7 @@
+@@ -84,7 +84,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);
-#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB)
+#if HAVE_ZLIB
REGISTER_LONG_CONSTANT("IMAGETYPE_SWC", IMAGE_FILETYPE_SWC, CONST_CS | CONST_PERSISTENT);
- #endif
+ #endif
REGISTER_LONG_CONSTANT("IMAGETYPE_IFF", IMAGE_FILETYPE_IFF, CONST_CS | CONST_PERSISTENT);
-@@ -184,7 +184,7 @@
+@@ -192,7 +192,7 @@ static unsigned long int php_swf_get_bit
}
/* }}} */
+#if HAVE_ZLIB
/* {{{ php_handle_swc
*/
- static struct gfxinfo *php_handle_swc(php_stream * stream TSRMLS_DC)
-@@ -1321,7 +1321,7 @@
+ static struct gfxinfo *php_handle_swc(php_stream * stream)
+@@ -1325,7 +1325,7 @@ static void php_getimagesize_from_stream
result = php_handle_swf(stream);
break;
case IMAGE_FILETYPE_SWC:
Summary(pl.UTF-8): Dowiązanie symboliczne /usr/bin/php
Group: Development/Languages/PHP
Requires: %{name}-cli = %{epoch}:%{version}-%{release}
-Obsoletes: /usr/bin/php
Obsoletes: php-program < 4:5.3.28-7
Obsoletes: php4-program
Obsoletes: php52-program
[ ! -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 -- %{name}-common < 4:5.6.4-2, php-common < 4:5.6.4-2
# 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.6.4-2, php-common < 4:5.6.4-2
# 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-7.0/ext/spl/config.m4~ 2015-05-21 17:57:06.000000000 +0300
-+++ php-7.0/ext/spl/config.m4 2015-05-23 11:25:19.609715006 +0300
-@@ -22,6 +22,6 @@
- CPPFLAGS=$old_CPPFLAGS
- AC_DEFINE_UNQUOTED(HAVE_PACKED_OBJECT_VALUE, $ac_result, [Whether struct _zend_object_value is packed])
+diff -urNp -x '*.orig' php-7.0.33.org/ext/pdo/pdo.c php-7.0.33/ext/pdo/pdo.c
+--- php-7.0.33.org/ext/pdo/pdo.c 2018-12-04 18:23:01.000000000 +0100
++++ php-7.0.33/ext/pdo/pdo.c 2021-08-23 23:36:38.248768024 +0200
+@@ -130,7 +130,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-7.0.33.org/ext/phar/Makefile.frag php-7.0.33/ext/phar/Makefile.frag
+--- php-7.0.33.org/ext/phar/Makefile.frag 2018-12-04 18:22:51.000000000 +0100
++++ php-7.0.33/ext/phar/Makefile.frag 2021-08-23 23:36:38.248768024 +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-7.0.33.org/ext/spl/config.m4 php-7.0.33/ext/spl/config.m4
+--- php-7.0.33.org/ext/spl/config.m4 2018-12-04 18:22:57.000000000 +0100
++++ php-7.0.33/ext/spl/config.m4 2021-08-23 23:36:38.245434647 +0200
+@@ -2,6 +2,6 @@ dnl $Id$
+ dnl config.m4 for extension SPL
+
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, no,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
+ 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,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
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-7.0.33.org/ext/spl/spl_iterators.c php-7.0.33/ext/spl/spl_iterators.c
+--- php-7.0.33.org/ext/spl/spl_iterators.c 2018-12-04 18:22:57.000000000 +0100
++++ php-7.0.33/ext/spl/spl_iterators.c 2021-08-23 23:36:38.245434647 +0200
+@@ -60,7 +60,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 @@
+@@ -3791,6 +3797,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.4.0alpha3/ext/spl/spl_iterators.h~ 2011-07-27 11:48:08.000000000 +0300
-+++ php-5.4.0alpha3/ext/spl/spl_iterators.h 2011-08-08 00:12:10.892993117 +0300
-@@ -51,7 +51,12 @@
+diff -urNp -x '*.orig' php-7.0.33.org/ext/spl/spl_iterators.h php-7.0.33/ext/spl/spl_iterators.h
+--- php-7.0.33.org/ext/spl/spl_iterators.h 2018-12-04 18:22:57.000000000 +0100
++++ php-7.0.33/ext/spl/spl_iterators.h 2021-08-23 23:36:38.245434647 +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;
extern PHPAPI zend_class_entry *spl_ce_CallbackFilterIterator;
extern PHPAPI zend_class_entry *spl_ce_RecursiveCallbackFilterIterator;
---- 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
-@@ -49,6 +49,9 @@
+diff -urNp -x '*.orig' php-7.0.33.org/ext/standard/array.c php-7.0.33/ext/standard/array.c
+--- php-7.0.33.org/ext/standard/array.c 2018-12-04 18:22:44.000000000 +0100
++++ php-7.0.33/ext/standard/array.c 2021-08-23 23:36:38.248768024 +0200
+@@ -50,6 +50,9 @@
#ifdef HAVE_SPL
#include "ext/spl/spl_array.h"
#endif
/* {{{ 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