CVS update: php31/main
| From: | shane | Date: | Thu, 27 Aug 1998 05:01:12 +0000 |
| Subject: | CVS update: php31/main | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-602@lists.php.net to get a copy of this message | ||
Date: Thursday August 27, 1998 @ 1:01
Author: shane
Update of /repository/php31/main
In directory asf:/u2/tmp/cvs-serv25351/main
Modified Files:
automated_configuration.h main.c mime.c phpsapi_core.dsp
Log Message:
compile fixes
Index: php31/main/automated_configuration.h
diff -c php31/main/automated_configuration.h:2.2 php31/main/automated_configuration.h:2.3
*** php31/main/automated_configuration.h:2.2 Wed Aug 26 01:04:07 1998
--- php31/main/automated_configuration.h Thu Aug 27 01:01:11 1998
***************
*** 25,31 ****
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")
--- 25,31 ----
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(upload_max_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")
Index: php31/main/main.c
diff -c php31/main/main.c:2.24 php31/main/main.c:2.25
*** php31/main/main.c:2.24 Wed Aug 26 01:04:07 1998
--- php31/main/main.c Thu Aug 27 01:01:11 1998
***************
*** 29,35 ****
+----------------------------------------------------------------------+
*/
! /* $Id: main.c,v 2.24 1998/08/26 05:04:07 rasmus Exp $ */
/* #define CRASH_DETECTION */
--- 29,35 ----
+----------------------------------------------------------------------+
*/
! /* $Id: main.c,v 2.25 1998/08/27 05:01:11 shane Exp $ */
/* #define CRASH_DETECTION */
***************
*** 323,329 ****
if (!(type & E_CORE)) {
filename = php3_get_filename(GLOBAL(current_lineno));
}
! if (GLOBAL(php3_ini)->log_errors || GLOBAL(php3_ini)->display_errors) {
va_start(args, format);
size = vsnprintf(buffer, sizeof(buffer) - 1, format, args);
va_end(args);
--- 323,329 ----
if (!(type & E_CORE)) {
filename = php3_get_filename(GLOBAL(current_lineno));
}
! if (GLOBAL(php3_ini)->display_errors || GLOBAL(php3_ini)->log_errors) {
va_start(args, format);
size = vsnprintf(buffer, sizeof(buffer) - 1, format, args);
va_end(args);
***************
*** 877,882 ****
--- 877,885 ----
if (cfg_get_string("error_log", &php3_ini_master.error_log) == FAILURE) {
php3_ini_master.error_log = NULL;
}
+ if (cfg_get_long("error_reporting", &php3_ini_master.error_reporting) == FAILURE)
{
+ php3_ini_master.error_reporting = 7;
+ }
if (cfg_get_long("track_errors", &php3_ini_master.track_errors) == FAILURE) {
php3_ini_master.track_errors = 0;
***************
*** 960,966 ****
/* 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) {
--- 963,969 ----
/* 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_max_filesize) == FAILURE) {
php3_ini_master.upload_max_filesize = 2097152; /* 2 Meg default */
}
if (cfg_get_string("extension_dir", &php3_ini_master.extension_dir) == FAILURE) {
Index: php31/main/mime.c
diff -c php31/main/mime.c:2.3 php31/main/mime.c:2.4
*** php31/main/mime.c:2.3 Wed Aug 26 01:04:08 1998
--- php31/main/mime.c Thu Aug 27 01:01:11 1998
***************
*** 27,33 ****
| |
+----------------------------------------------------------------------+
*/
! /* $Id: mime.c,v 2.3 1998/08/26 05:04:08 rasmus Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
#endif
--- 27,33 ----
| |
+----------------------------------------------------------------------+
*/
! /* $Id: mime.c,v 2.4 1998/08/27 05:01:11 shane Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
#endif
***************
*** 197,204 ****
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)) {
--- 197,204 ----
SAFE_RETURN;
}
fn = tempnam(GLOBAL(php3_ini)->upload_tmp_dir, "php");
! if ((loc - ptr - 4) > GLOBAL(php3_ini)->upload_max_filesize) {
! php3_error(E_WARNING, "Max file size of %ld bytes exceeded - file [%s] not saved",
GLOBAL(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)) {
Index: php31/main/phpsapi_core.dsp
diff -c php31/main/phpsapi_core.dsp:2.6 php31/main/phpsapi_core.dsp:2.7
*** php31/main/phpsapi_core.dsp:2.6 Tue Aug 25 23:14:20 1998
--- php31/main/phpsapi_core.dsp Thu Aug 27 01:01:11 1998
***************
*** 261,270 ****
# End Source File
# Begin Source File
- SOURCE=.\pt_alloc.c
- # End Source File
- # Begin Source File
-
SOURCE=.\safe_mode.c
# End Source File
# Begin Source File
--- 261,266 ----
--
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