8.0.22

1 files changed, 0 insertions, 216 deletions

diff --git a/debian-php-8.0.21.patch b/debian-php-8.0.21.patch
deleted file mode 100644
index 6d616accffcc..000000000000
--- a/debian-php-8.0.21.patch
+++ /dev/null
@@ -1,216 +0,0 @@
-
-diff --git a/php.ini-development b/php.ini-development
-index c70b1ed..d8a16e1 100644
---- a/php.ini-development
-+++ b/php.ini-development
-@@ -315,6 +315,12 @@
- ; or per-virtualhost web server configuration file.
- ; Note: disables the realpath cache
- ; http://php.net/open-basedir
-+
-+; NOTE: this is considered a "broken" security measure.
-+;       Applications relying on this feature will not receive full
-+;       support by the security team.  For more information please
-+;       see /usr/share/doc/php-common/README.Debian.security
-+;
- ;open_basedir =
- 
- ; This directive allows you to disable certain functions.
-diff --git a/ext/dba/config.m4 b/ext/dba/config.m4
-index 1e80319..51bdd84 100644
---- a/ext/dba/config.m4
-+++ b/ext/dba/config.m4
-@@ -375,61 +375,13 @@
-   dbdp4="/usr/local/BerkeleyDB.4."
-   dbdp5="/usr/local/BerkeleyDB.5."
-   for i in $PHP_DB4 ${dbdp5}1 ${dbdp5}0 ${dbdp4}8 ${dbdp4}7 ${dbdp4}6 ${dbdp4}5 ${dbdp4}4 ${dbdp4}3 ${dbdp4}2 ${dbdp4}1 ${dbdp}0 /usr/local /usr; do
--    if test -f "$i/db5/db.h"; then
--      THIS_PREFIX=$i
--      THIS_INCLUDE=$i/db5/db.h
--      break
--    elif test -f "$i/db4/db.h"; then
--      THIS_PREFIX=$i
--      THIS_INCLUDE=$i/db4/db.h
--      break
--    elif test -f "$i/include/db5.3/db.h"; then
--      THIS_PREFIX=$i
--      THIS_INCLUDE=$i/include/db5.3/db.h
--      break
--    elif test -f "$i/include/db5.1/db.h"; then
--      THIS_PREFIX=$i
--      THIS_INCLUDE=$i/include/db5.1/db.h
--      break
--    elif test -f "$i/include/db5.0/db.h"; then
--      THIS_PREFIX=$i
--      THIS_INCLUDE=$i/include/db5.0/db.h
--      break
--    elif test -f "$i/include/db4.8/db.h"; then
--      THIS_PREFIX=$i
--      THIS_INCLUDE=$i/include/db4.8/db.h
--      break
--    elif test -f "$i/include/db4.7/db.h"; then
--      THIS_PREFIX=$i
--      THIS_INCLUDE=$i/include/db4.7/db.h
--      break
--    elif test -f "$i/include/db4.6/db.h"; then
--      THIS_PREFIX=$i
--      THIS_INCLUDE=$i/include/db4.6/db.h
--      break
--    elif test -f "$i/include/db4.5/db.h"; then
--      THIS_PREFIX=$i
--      THIS_INCLUDE=$i/include/db4.5/db.h
--      break
--    elif test -f "$i/include/db4/db.h"; then
--      THIS_PREFIX=$i
--      THIS_INCLUDE=$i/include/db4/db.h
--      break
--    elif test -f "$i/include/db/db4.h"; then
--      THIS_PREFIX=$i
--      THIS_INCLUDE=$i/include/db/db4.h
--      break
--    elif test -f "$i/include/db4.h"; then
--      THIS_PREFIX=$i
--      THIS_INCLUDE=$i/include/db4.h
--      break
--    elif test -f "$i/include/db.h"; then
-+    if test -f "$i/include/db.h"; then
-       THIS_PREFIX=$i
-       THIS_INCLUDE=$i/include/db.h
-       break
-     fi
-   done
--  PHP_DBA_DB_CHECK(4, db-5.3 db-5.1 db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)])
-+  PHP_DBA_DB_CHECK(4, db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)])
- fi
- PHP_DBA_STD_RESULT(db4,Berkeley DB4)
- 
-diff --git a/ext/dba/dba.c b/ext/dba/dba.c
-index 7e8ef11..c111687 100644
---- a/ext/dba/dba.c
-+++ b/ext/dba/dba.c
-@@ -50,6 +50,10 @@
- #include "php_lmdb.h"
- #include "dba_arginfo.h"
- 
-+#ifdef DB4_INCLUDE_FILE
-+#include DB4_INCLUDE_FILE
-+#endif
-+
- PHP_MINIT_FUNCTION(dba);
- PHP_MSHUTDOWN_FUNCTION(dba);
- PHP_MINFO_FUNCTION(dba);
-@@ -452,6 +456,10 @@
- 
- 	php_info_print_table_start();
-  	php_info_print_table_row(2, "DBA support", "enabled");
-+#ifdef DB_VERSION_STRING
-+ 	php_info_print_table_row(2, "libdb header version", DB_VERSION_STRING);
-+ 	php_info_print_table_row(2, "libdb library version", db_version(NULL, NULL, NULL));
-+#endif
- 	if (handlers.s) {
- 		smart_str_0(&handlers);
- 		php_info_print_table_row(2, "Supported handlers", ZSTR_VAL(handlers.s));
-diff --git a/sapi/fpm/php-fpm.8.in b/sapi/fpm/php-fpm.8.in
-index 972c242..002c44b 100644
---- a/sapi/fpm/php-fpm.8.in
-+++ b/sapi/fpm/php-fpm.8.in
-@@ -139,22 +139,8 @@
- .TP
- .B php.ini
- The standard php configuration file.
--.SH EXAMPLES
--For any unix systems which use init.d for their main process manager, you should use the init script provided to start and stop the php-fpm daemon.
--.P
--.PD 1
--.RS
--sudo /etc/init.d/php-fpm start
--.RE
--.TP
--For any unix systems which use systemd for their main process manager, you should use the unit file provided to start and stop the php-fpm daemon.
--.P
--.PD 1
--.RS
--sudo systemctl start php-fpm.service
--.RE
--.TP
--If your installation has no appropriate init script, launch php-fpm with no arguments. It will launch as a daemon (background process) by default. The file @php_fpm_localstatedir@/run/php-fpm.pid determines whether php-fpm is already up and running. Once started, php-fpm then responds to several POSIX signals:
-+.SH SIGNAL
-+Once started, php-fpm then responds to several POSIX signals:
- .P
- .PD 0
- .RS
-@@ -168,10 +154,6 @@
- .RE
- .PD 1
- .P
--.SH TIPS
--The PHP-FPM CGI daemon will work well with most popular webservers, including Apache2, lighttpd and nginx.
--.PD 1
--.P
- .SH SEE ALSO
- The PHP-FPM website:
- .PD 0
-diff --git a/main/streams/plain_wrapper.c b/main/streams/plain_wrapper.c
-index aa173c9..151cb3a 100644
---- a/main/streams/plain_wrapper.c
-+++ b/main/streams/plain_wrapper.c
-@@ -720,7 +720,13 @@
- 
- 				switch (value) {
- 					case PHP_STREAM_MMAP_SUPPORTED:
--						return fd == -1 ? PHP_STREAM_OPTION_RETURN_ERR : PHP_STREAM_OPTION_RETURN_OK;
-+						if (fd == -1)
-+							return PHP_STREAM_OPTION_RETURN_ERR;
-+						/* Don't mmap large files */
-+						do_fstat(data, 1);
-+						if (data->sb.st_size > 4 * 1024 * 1024)
-+							return PHP_STREAM_OPTION_RETURN_ERR;
-+						return PHP_STREAM_OPTION_RETURN_OK;
- 
- 					case PHP_STREAM_MMAP_MAP_RANGE:
- 						if (do_fstat(data, 1) != 0) {
-diff --git a/ext/dba/dba.c b/ext/dba/dba.c
-index c111687..bd79868 100644
---- a/ext/dba/dba.c
-+++ b/ext/dba/dba.c
-@@ -890,7 +890,7 @@
- 		}
- 	}
- 
--	if (error || hptr->open(info, &error) != SUCCESS) {
-+	if (error || (hptr->open)(info, &error) != SUCCESS) {
- 		dba_close(info);
- 		php_error_docref2(NULL, Z_STRVAL(args[0]), Z_STRVAL(args[1]), E_WARNING, "Driver initialization failed for handler: %s%s%s", hptr->name, error?": ":"", error?error:"");
- 		FREENOW;
-diff --git a/ext/dba/dba_db3.c b/ext/dba/dba_db3.c
-index a22c28f..786c4e6 100644
---- a/ext/dba/dba_db3.c
-+++ b/ext/dba/dba_db3.c
-@@ -91,9 +91,9 @@
- 	    dbp->set_errcall(dbp, php_dba_db3_errcall_fcn);
- 		if(
- #if (DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1))
--			(err=dbp->open(dbp, 0, info->path, NULL, type, gmode, filemode)) == 0) {
-+			(err=(dbp->open)(dbp, 0, info->path, NULL, type, gmode, filemode)) == 0) {
- #else
--			(err=dbp->open(dbp, info->path, NULL, type, gmode, filemode)) == 0) {
-+			(err=(dbp->open)(dbp, info->path, NULL, type, gmode, filemode)) == 0) {
- #endif
- 			dba_db3_data *data;
- 
-diff --git a/ext/dba/dba_db4.c b/ext/dba/dba_db4.c
-index d2d8df3..a0dd140 100644
---- a/ext/dba/dba_db4.c
-+++ b/ext/dba/dba_db4.c
-@@ -120,9 +120,9 @@
- 	    dbp->set_errcall(dbp, php_dba_db4_errcall_fcn);
- 	    if (
- #if (DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1))
--			(err=dbp->open(dbp, 0, info->path, NULL, type, gmode, filemode)) == 0) {
-+			(err=(dbp->open)(dbp, 0, info->path, NULL, type, gmode, filemode)) == 0) {
- #else
--			(err=dbp->open(dbp, info->path, NULL, type, gmode, filemode)) == 0) {
-+			(err=(dbp->open)(dbp, info->path, NULL, type, gmode, filemode)) == 0) {
- #endif
- 			dba_db4_data *data;
-