cvs: /php4 main.c mod_php4.c php_globals.h /php4/ext/standard file.c

zeev Sun Sep 12 16:36:48 1999 EDT Modified files: /php4 main.c mod_php4.c php_globals.h /php4/ext/standard file.c Log: That's important enough to be cached Index: php4/main.c diff -u php4/main.c:1.121 php4/main.c:1.122 --- php4/main.c:1.121 Sat Sep 11 23:25:02 1999 +++ php4/main.c Sun Sep 12 16:36:47 1999 @@ -19,7 +19,7 @@ */ -/* $Id: main.c,v 1.121 1999/09/12 03:25:02 zeev Exp $ */ +/* $Id: main.c,v 1.122 1999/09/12 20:36:47 zeev Exp $ */ #include <stdio.h> @@ -187,11 +187,11 @@ STD_PHP_INI_BOOLEAN("magic_quotes_runtime", "0", PHP_INI_ALL, OnUpdateBool, magic_quotes_runtime, php_core_globals, core_globals) STD_PHP_INI_BOOLEAN("magic_quotes_sybase", "0", PHP_INI_ALL, OnUpdateBool, magic_quotes_sybase, php_core_globals, core_globals) - STD_PHP_INI_BOOLEAN("safe_mode", "0", PHP_INI_SYSTEM, OnUpdateBool, safe_mode, php_core_globals, core_globals) - STD_PHP_INI_BOOLEAN("sql.safe_mode", "0", PHP_INI_SYSTEM, OnUpdateBool, sql_safe_mode, php_core_globals, core_globals) + STD_PHP_INI_BOOLEAN("safe_mode", "0", PHP_INI_SYSTEM, OnUpdateBool, safe_mode, php_core_globals, core_globals) + STD_PHP_INI_BOOLEAN("sql.safe_mode", "0", PHP_INI_SYSTEM, OnUpdateBool, sql_safe_mode, php_core_globals, core_globals) STD_PHP_INI_ENTRY("safe_mode_exec_dir", "1", PHP_INI_SYSTEM, OnUpdateString, safe_mode_exec_dir, php_core_globals, core_globals) - STD_PHP_INI_BOOLEAN("enable_dl", "1", PHP_INI_SYSTEM, OnUpdateBool, enable_dl, php_core_globals, core_globals) - PHP_INI_ENTRY_EX("expose_php", "1", PHP_INI_ALL, NULL, php_ini_boolean_displayer_cb) + STD_PHP_INI_BOOLEAN("enable_dl", "1", PHP_INI_SYSTEM, OnUpdateBool, enable_dl, php_core_globals, core_globals) + STD_PHP_INI_BOOLEAN("expose_php", "1", PHP_INI_SYSTEM, OnUpdateBool, expose_php, php_core_globals, core_globals) PHP_INI_ENTRY("SMTP", "localhost", PHP_INI_ALL, NULL) PHP_INI_ENTRY("sendmail_path", DEFAULT_SENDMAIL_PATH, PHP_INI_SYSTEM, NULL) @@ -1120,7 +1120,7 @@ SLS_FETCH(); if (SG(request_info).query_string && SG(request_info).query_string[0]=='=' - && INI_INT("expose_php")) { + && PG(expose_php)) { if (!strcmp(SG(request_info).query_string+1, "PHPE9568F34-D428-11d2-A769-00AA001ACF42")) { char *header_line = estrndup(CONTEXT_TYPE_IMAGE_GIF, sizeof(CONTEXT_TYPE_IMAGE_GIF)); Index: php4/mod_php4.c diff -u php4/mod_php4.c:1.23 php4/mod_php4.c:1.24 --- php4/mod_php4.c:1.23 Sat Sep 11 23:08:29 1999 +++ php4/mod_php4.c Sun Sep 12 16:36:48 1999 @@ -17,7 +17,7 @@ | PHP 4.0 patches by Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: mod_php4.c,v 1.23 1999/09/12 03:08:29 zeev Exp $ */ +/* $Id: mod_php4.c,v 1.24 1999/09/12 20:36:48 zeev Exp $ */ #include "httpd.h" #include "http_config.h" @@ -488,7 +488,7 @@ apache_php_initialized = 1; } #if MODULE_MAGIC_NUMBER >= 19980527 - if (INI_INT("expose_php")) { + if (INI_INT(PG(expose_php)) { ap_add_version_component("PHP/" PHP_VERSION); } #endif Index: php4/php_globals.h diff -u php4/php_globals.h:1.23 php4/php_globals.h:1.24 --- php4/php_globals.h:1.23 Sat Sep 11 11:04:45 1999 +++ php4/php_globals.h Sun Sep 12 16:36:48 1999 @@ -79,6 +79,8 @@ char *arg_separator; char *gpc_order; + zend_bool expose_php; + zend_bool track_vars; zend_bool gpc_globals; Index: php4/ext/standard/file.c diff -u php4/ext/standard/file.c:1.28 php4/ext/standard/file.c:1.29 --- php4/ext/standard/file.c:1.28 Sat Sep 11 14:38:34 1999 +++ php4/ext/standard/file.c Sun Sep 12 16:36:48 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: file.c,v 1.28 1999/09/11 18:38:34 sas Exp $ */ +/* $Id: file.c,v 1.29 1999/09/12 20:36:48 zeev Exp $ */ /* Synced with php3 revision 1.218 1999-06-16 [ssb] */ @@ -77,6 +77,10 @@ #ifdef HAVE_SYS_MMAN_H #include <sys/mman.h> +#endif + +#ifndef MAP_FAILED +#define MAP_FAILED ((void *) -1) #endif static void _php3_closesocket(int *);