diff --git a/www/php4/patches/patch-php_ini-dist b/www/php4/patches/patch-php_ini-dist index b3ec8abd7ef..fa597b04a90 100644 --- a/www/php4/patches/patch-php_ini-dist +++ b/www/php4/patches/patch-php_ini-dist @@ -1,6 +1,6 @@ -$OpenBSD: patch-php_ini-dist,v 1.7 2003/05/23 20:08:33 avsm Exp $ ---- php.ini-dist.orig Thu May 8 02:23:35 2003 -+++ php.ini-dist Thu May 22 16:21:01 2003 +$OpenBSD: patch-php_ini-dist,v 1.8 2003/05/31 13:20:51 avsm Exp $ +--- php.ini-dist.orig Sun May 25 19:35:18 2003 ++++ php.ini-dist Thu May 29 10:41:34 2003 @@ -408,10 +408,7 @@ default_mimetype = "text/html" ;;;;;;;;;;;;;;;;;;;;;;;;; @@ -22,7 +22,7 @@ $OpenBSD: patch-php_ini-dist,v 1.7 2003/05/23 20:08:33 avsm Exp $ ; Whether or not to enable the dl() function. The dl() function does NOT work ; properly in multithreaded servers, such as IIS or Zeus, and is automatically -@@ -479,7 +476,7 @@ upload_max_filesize = 2M +@@ -487,7 +484,7 @@ upload_max_filesize = 2M ;;;;;;;;;;;;;;;;;; ; Whether to allow the treatment of URLs (like http:// or ftp://) as files. @@ -31,7 +31,7 @@ $OpenBSD: patch-php_ini-dist,v 1.7 2003/05/23 20:08:33 avsm Exp $ ; Define the anonymous ftp password (your email address) ;from="john@doe.com" -@@ -498,77 +495,6 @@ default_socket_timeout = 60 +@@ -506,77 +503,6 @@ default_socket_timeout = 60 ; auto_detect_line_endings = Off @@ -109,7 +109,7 @@ $OpenBSD: patch-php_ini-dist,v 1.7 2003/05/23 20:08:33 avsm Exp $ ;;;;;;;;;;;;;;;;;;; ; Module Settings ; ;;;;;;;;;;;;;;;;;;; -@@ -580,13 +506,8 @@ default_socket_timeout = 60 +@@ -588,13 +514,8 @@ default_socket_timeout = 60 define_syslog_variables = Off [mail function] @@ -124,7 +124,7 @@ $OpenBSD: patch-php_ini-dist,v 1.7 2003/05/23 20:08:33 avsm Exp $ ;sendmail_path = [Java] -@@ -1092,3 +1013,57 @@ sockets.use_system_read = On +@@ -1100,3 +1021,57 @@ sockets.use_system_read = On ; Local Variables: ; tab-width: 4 ; End: diff --git a/www/php4/patches/patch-php_ini-recommended b/www/php4/patches/patch-php_ini-recommended index c21537634f2..72cce1f4a52 100644 --- a/www/php4/patches/patch-php_ini-recommended +++ b/www/php4/patches/patch-php_ini-recommended @@ -1,6 +1,6 @@ -$OpenBSD: patch-php_ini-recommended,v 1.5 2003/05/23 20:08:33 avsm Exp $ ---- php.ini-recommended.orig Thu May 8 02:23:35 2003 -+++ php.ini-recommended Thu May 22 16:21:19 2003 +$OpenBSD: patch-php_ini-recommended,v 1.6 2003/05/31 13:20:51 avsm Exp $ +--- php.ini-recommended.orig Sun May 25 19:35:18 2003 ++++ php.ini-recommended Thu May 29 10:41:34 2003 @@ -423,11 +423,8 @@ default_mimetype = "text/html" ;;;;;;;;;;;;;;;;;;;;;;;;; @@ -23,7 +23,7 @@ $OpenBSD: patch-php_ini-recommended,v 1.5 2003/05/23 20:08:33 avsm Exp $ ; Whether or not to enable the dl() function. The dl() function does NOT work ; properly in multithreaded servers, such as IIS or Zeus, and is automatically -@@ -494,7 +491,7 @@ upload_max_filesize = 2M +@@ -502,7 +499,7 @@ upload_max_filesize = 2M ;;;;;;;;;;;;;;;;;; ; Whether to allow the treatment of URLs (like http:// or ftp://) as files. @@ -32,7 +32,7 @@ $OpenBSD: patch-php_ini-recommended,v 1.5 2003/05/23 20:08:33 avsm Exp $ ; Define the anonymous ftp password (your email address) ;from="john@doe.com" -@@ -513,77 +510,6 @@ default_socket_timeout = 60 +@@ -521,77 +518,6 @@ default_socket_timeout = 60 ; auto_detect_line_endings = Off @@ -110,7 +110,7 @@ $OpenBSD: patch-php_ini-recommended,v 1.5 2003/05/23 20:08:33 avsm Exp $ ;;;;;;;;;;;;;;;;;;; ; Module Settings ; ;;;;;;;;;;;;;;;;;;; -@@ -595,11 +521,6 @@ default_socket_timeout = 60 +@@ -603,11 +529,6 @@ default_socket_timeout = 60 define_syslog_variables = Off [mail function] @@ -122,7 +122,7 @@ $OpenBSD: patch-php_ini-recommended,v 1.5 2003/05/23 20:08:33 avsm Exp $ ; For Unix only. You may supply arguments as well (default: "sendmail -t -i"). ;sendmail_path = -@@ -1087,6 +1008,56 @@ sockets.use_system_read = On +@@ -1095,6 +1016,56 @@ sockets.use_system_read = On ;exif.decode_jis_motorola = JIS ;exif.decode_jis_intel = JIS