CVS update: php31/main
| From: | rasmus | Date: | Wed, 26 Aug 1998 05:04:08 +0000 |
| Subject: | CVS update: php31/main | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-586@lists.php.net to get a copy of this message | ||
Date: Wednesday August 26, 1998 @ 1:04
Author: rasmus
Update of /repository/php31/main
In directory asf:/export/home/rasmus/php31/main
Modified Files:
automated_configuration.h main.c mime.c
Log Message:
Catch some missing 3.0 patches
Index: php31/main/automated_configuration.h
diff -c php31/main/automated_configuration.h:2.1 php31/main/automated_configuration.h:2.2
*** php31/main/automated_configuration.h:2.1 Fri Aug 21 13:37:05 1998
--- php31/main/automated_configuration.h Wed Aug 26 01:04:07 1998
***************
*** 12,18 ****
INI_ENTRY(arg_separator, AC_STRING, "&", AC_YES, "The GET method argument
separator")
INI_ENTRY(gpc_order, AC_STRING, "GPC", AC_YES, "The order of GET/POST/Cookie
data")
INI_ENTRY(enable_dl, AC_BOOL, 1, AC_NO, "Whether to enable dynamic extensions or
not")
! INI_ENTRY(open_basedir, AC_STRING, NULL, AC_YES, "Open basedir ??")
/* highlight entries */
GROUP_INI_ENTRY(highlight, string, AC_STRING, "#DD0000", AC_YES, "String color
in syntax highlighting")
--- 12,18 ----
INI_ENTRY(arg_separator, AC_STRING, "&", AC_YES, "The GET method argument
separator")
INI_ENTRY(gpc_order, AC_STRING, "GPC", AC_YES, "The order of GET/POST/Cookie
data")
INI_ENTRY(enable_dl, AC_BOOL, 1, AC_NO, "Whether to enable dynamic extensions or
not")
! INI_ENTRY(open_basedir, AC_STRING, NULL, AC_NO_SAFEMODE, "Only open files from the base
dir of a request")
/* highlight entries */
GROUP_INI_ENTRY(highlight, string, AC_STRING, "#DD0000", AC_YES, "String color
in syntax highlighting")
***************
*** 25,36 ****
--- 25,39 ----
INI_ENTRY(max_execution_time, AC_LONG, 30, AC_NO_SAFEMODE, "Maximum execution time
(secs)")
INI_ENTRY(memory_limit, AC_LONG, 8388608,AC_NO_SAFEMODE, "Memory limit (bytes)")
+ INI_ENTRY(max_upload_filesize, AC_LONG, 2097152, AC_YES, "Maximum size of uploaded file in
bytes")
INI_ENTRY(error_reporting, AC_LONG, 7, AC_YES, "Error reporting level")
INI_ENTRY(display_errors, AC_BOOL, 1, AC_YES, "Display error messags")
INI_ENTRY(log_errors, AC_BOOL, 0, AC_NO, "Log error messages")
INI_ENTRY(track_errors, AC_BOOL, 0, AC_YES, "Track errors in $php_errormsg")
INI_ENTRY(warn_plus_overloading,AC_BOOL, 0, AC_YES, "Warn when + is used with
strings")
INI_ENTRY(error_log, AC_STRING, NULL, AC_YES, "device on which to log errors")
+ INI_ENTRY(error_prepend_string, AC_STRING, NULL, AC_YES, "String to add before an error
msg from PHP")
+ INI_ENTRY(error_append_string, AC_STRING, NULL, AC_YES, "String to add after an error msg
from PHP")
/* data handling */
Index: php31/main/main.c
diff -c php31/main/main.c:2.23 php31/main/main.c:2.24
*** php31/main/main.c:2.23 Mon Aug 24 15:19:44 1998
--- php31/main/main.c Wed Aug 26 01:04:07 1998
***************
*** 29,35 ****
+----------------------------------------------------------------------+
*/
! /* $Id: main.c,v 2.23 1998/08/24 19:19:44 zeev Exp $ */
/* #define CRASH_DETECTION */
--- 29,35 ----
+----------------------------------------------------------------------+
*/
! /* $Id: main.c,v 2.24 1998/08/26 05:04:07 rasmus Exp $ */
/* #define CRASH_DETECTION */
***************
*** 960,965 ****
--- 960,968 ----
/* GLOBAL(php3_ini)->upload_tmp_dir = UPLOAD_TMPDIR; */
php3_ini_master.upload_tmp_dir = NULL;
}
+ if (cfg_get_long("upload_max_filesize", &php3_ini_master.upload_tmp_dir) ==
FAILURE) {
+ php3_ini_master.upload_max_filesize = 2097152; /* 2 Meg default */
+ }
if (cfg_get_string("extension_dir", &php3_ini_master.extension_dir) == FAILURE) {
php3_ini_master.extension_dir = NULL;
}
Index: php31/main/mime.c
diff -c php31/main/mime.c:2.2 php31/main/mime.c:2.3
*** php31/main/mime.c:2.2 Tue Aug 25 14:56:41 1998
--- php31/main/mime.c Wed Aug 26 01:04:08 1998
***************
*** 27,33 ****
| |
+----------------------------------------------------------------------+
*/
! /* $Id: mime.c,v 2.2 1998/08/25 18:56:41 rasmus Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
#endif
--- 27,33 ----
| |
+----------------------------------------------------------------------+
*/
! /* $Id: mime.c,v 2.3 1998/08/26 05:04:08 rasmus Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
#endif
***************
*** 197,203 ****
SAFE_RETURN;
}
fn = tempnam(GLOBAL(php3_ini)->upload_tmp_dir, "php");
! if (max_file_size && ((loc - ptr - 4) > max_file_size)) {
php3_error(E_WARNING, "Max file size exceeded - file [%s] not saved", namebuf);
bytes = 0;
SET_VAR_STRING(namebuf, estrdup("none"));
--- 197,207 ----
SAFE_RETURN;
}
fn = tempnam(GLOBAL(php3_ini)->upload_tmp_dir, "php");
! if ((loc - ptr - 4) > php3_ini.upload_max_filesize) {
! php3_error(E_WARNING, "Max file size of %ld bytes exceeded - file [%s] not saved",
php3_ini.upload_max_filesize, namebuf);
! bytes=0;
! SET_VAR_STRING(namebuf, estrdup("none"));
! } else if (max_file_size && ((loc - ptr - 4) > max_file_size)) {
php3_error(E_WARNING, "Max file size exceeded - file [%s] not saved", namebuf);
bytes = 0;
SET_VAR_STRING(namebuf, estrdup("none"));
--
PHP Development Mailing List http://www.php.net/
To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net
For help: php-dev-help@lists.php.net