cvs: php4 /ext/standard basic_functions.c browscap.c /main Makefile.in configuration-parser.y configuration-scanner.l php_ini.c php_ini.h php_main.h
/win32 php4.dsp php4.dsw php4dll.dsp php4dllts.dsp
| From: | Zeev Suraski | Date: | Mon, 30 Oct 2000 23:39:15 +0000 |
| Subject: | cvs: php4 /ext/standard basic_functions.c browscap.c /main Makefile.in configuration-parser.y configuration-scanner.l php_ini.c php_ini.h php_main.h /win32 php4.dsp php4.dsw php4dll.dsp php4dllts.dsp |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-2364@lists.php.net to get a copy of this message | ||
zeev Mon Oct 30 15:39:15 2000 EDT
Removed files:
/php4/main configuration-parser.y configuration-scanner.l
Modified files:
/php4/ext/standard basic_functions.c browscap.c
/php4/main Makefile.in php_ini.c php_ini.h php_main.h
/php4/win32 php4.dsp php4.dsw php4dll.dsp php4dllts.dsp
Log:
- Complete the move to the new INI parser. (Side effect: at last, people
can finally have spaces and tabs in their extension statements...)
Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.273 php4/ext/standard/basic_functions.c:1.274 --- php4/ext/standard/basic_functions.c:1.273 Sun Oct 29 15:34:33 2000 +++ php4/ext/standard/basic_functions.c Mon Oct 30 15:39:14 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.c,v 1.273 2000/10/29 23:34:33 zeev Exp $ */ +/* $Id: basic_functions.c,v 1.274 2000/10/30 23:39:14 zeev Exp $ */ #include "php.h" #include "php_main.h" @@ -2402,14 +2402,15 @@ } convert_to_string_ex(filename); - fh.handle.fp = V_FOPEN((*filename)->value.str.val, "r"); + fh.handle.fp = V_FOPEN(Z_STRVAL_PP(filename), "r"); if (!fh.handle.fp) { php_error(E_WARNING,"Cannot open '%s' for reading", (*filename)->value.str.val); return; } fh.type = ZEND_HANDLE_FP; + fh.filename = Z_STRVAL_PP(filename); array_init(return_value); - zend_parse_ini_file(&fh, ini_parser_cb, return_value); + zend_parse_ini_file(&fh, 0, ini_parser_cb, return_value); } /* }}} */ Index: php4/ext/standard/browscap.c diff -u php4/ext/standard/browscap.c:1.36 php4/ext/standard/browscap.c:1.37 --- php4/ext/standard/browscap.c:1.36 Sun Oct 29 15:10:22 2000 +++ php4/ext/standard/browscap.c Mon Oct 30 15:39:14 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: browscap.c,v 1.36 2000/10/29 23:10:22 zeev Exp $ */ +/* $Id: browscap.c,v 1.37 2000/10/30 23:39:14 zeev Exp $ */ #include "php.h" #include "php_regex.h" @@ -33,7 +33,7 @@ static void browscap_entry_dtor(zval *pvalue) { - if (pvalue->type == IS_OBJECT || pvalue->type == IS_ARRAY) { + if (pvalue->type == IS_OBJECT) { zend_hash_destroy(pvalue->value.obj.properties); free(pvalue->value.obj.properties); } @@ -144,7 +144,8 @@ php_error(E_WARNING,"Cannot open '%s' for reading", browscap); return FAILURE; } - zend_parse_ini_file(&fh, (zend_ini_parser_cb_t) php_browscap_parser_cb, &browser_hash); + fh.filename = browscap; + zend_parse_ini_file(&fh, 1, (zend_ini_parser_cb_t) php_browscap_parser_cb, &browser_hash); } return SUCCESS; Index: php4/main/Makefile.in diff -u php4/main/Makefile.in:1.10 php4/main/Makefile.in:1.11 --- php4/main/Makefile.in:1.10 Wed Oct 11 23:32:10 2000 +++ php4/main/Makefile.in Mon Oct 30 15:39:14 2000 @@ -2,7 +2,6 @@ LTLIBRARY_SOURCES = \ main.c internal_functions.c snprintf.c php_sprintf.c \ - configuration-parser.c configuration-scanner.c \ safe_mode.c fopen-wrappers.c alloca.c \ php_ini.c SAPI.c rfc1867.c php_content_types.c strlcpy.c \ strlcat.c mergesort.c reentrancy.c php_variables.c php_ticks.c \ @@ -10,11 +9,6 @@ include $(top_srcdir)/build/ltlib.mk -configuration-parser.h configuration-parser.c: $(srcdir)/configuration-parser.y - $(YACC) -p cfg -v -d $< -o configuration-parser.c - -configuration-scanner.c: $(srcdir)/configuration-scanner.l - $(LEX) -Pcfg -o$@ -i $< internal_functions.c: $(srcdir)/internal_functions.c.in $(top_builddir)/config.status cd $(top_builddir) && \ Index: php4/main/php_ini.c diff -u php4/main/php_ini.c:1.42 php4/main/php_ini.c:1.43 --- php4/main/php_ini.c:1.42 Sun Oct 29 14:42:01 2000 +++ php4/main/php_ini.c Mon Oct 30 15:39:14 2000 @@ -20,8 +20,14 @@ #include "php.h" #include "ext/standard/info.h" #include "zend_ini.h" +#include "php_ini.h" +#include "ext/standard/dl.h" +#include "zend_extensions.h" +static HashTable configuration_hash; +PHPAPI extern char *php_ini_path; + static void php_ini_displayer_cb(zend_ini_entry *ini_entry, int type) { if (ini_entry->displayer) { @@ -83,3 +89,215 @@ php_info_print_table_end(); } + + +/* php.ini support */ + +#ifdef ZTS +# if (ZEND_DEBUG) +# define ZEND_EXTENSION_TOKEN "zend_extension_debug_ts" +# else +# define ZEND_EXTENSION_TOKEN "zend_extension_ts" +# endif +#else +# if (ZEND_DEBUG) +# define ZEND_EXTENSION_TOKEN "zend_extension_debug" +# else +# define ZEND_EXTENSION_TOKEN "zend_extension" +# endif +#endif + + +static void pvalue_config_destructor(zval *pvalue) +{ + if (pvalue->type == IS_STRING && pvalue->value.str.val != empty_string) { + free(pvalue->value.str.val); + } +} + + +static void php_config_ini_parser_cb(zval *arg1, zval *arg2, int callback_type, void *arg) +{ + switch (callback_type) { + case ZEND_INI_PARSER_ENTRY: { + zval *entry; + + if (!arg2) { + break; + } + if (!strcasecmp(Z_STRVAL_P(arg1), "extension")) { /* load function module */ + zval dummy; + + php_dl(arg2, MODULE_PERSISTENT, &dummy); + } else if (!strcasecmp(Z_STRVAL_P(arg1), ZEND_EXTENSION_TOKEN)) { /* load Zend extension */ + zend_load_extension(Z_STRVAL_P(arg2)); + } else { + zend_hash_update(&configuration_hash, Z_STRVAL_P(arg1), Z_STRLEN_P(arg1)+1, arg2, sizeof(zval), (void **) &entry); + Z_STRVAL_P(entry) = zend_strndup(Z_STRVAL_P(entry), Z_STRLEN_P(entry)); + php_alter_ini_entry(Z_STRVAL_P(arg1), Z_STRLEN_P(arg1)+1, Z_STRVAL_P(arg2), Z_STRLEN_P(arg2)+1, PHP_INI_SYSTEM, PHP_INI_STAGE_STARTUP); + } + } + break; + case ZEND_INI_PARSER_SECTION: + break; + } +} + + +int php_init_config(void) +{ + PLS_FETCH(); + + if (zend_hash_init(&configuration_hash, 0, NULL, (dtor_func_t) pvalue_config_destructor, 1)==FAILURE) { + return FAILURE; + } + +#if USE_CONFIG_FILE + { + char *env_location,*default_location,*php_ini_search_path; + int safe_mode_state = PG(safe_mode); + char *open_basedir = PG(open_basedir); + char *opened_path; + int free_default_location=0; + zend_file_handle fh; + + env_location = getenv("PHPRC"); + if (!env_location) { + env_location=""; + } +#ifdef PHP_WIN32 + { + if (php_ini_path) { + default_location = php_ini_path; + } else { + default_location = (char *) malloc(512); + + if (!GetWindowsDirectory(default_location,255)) { + default_location[0]=0; + } + free_default_location=1; + } + } +#else + if (!php_ini_path) { + default_location = CONFIGURATION_FILE_PATH; + } else { + default_location = php_ini_path; + } +#endif + +/* build a path */ + php_ini_search_path = (char *) malloc(sizeof(".")+strlen(env_location)+strlen(default_location)+2+1); + + if (!php_ini_path) { +#ifdef PHP_WIN32 + sprintf(php_ini_search_path,".;%s;%s",env_location,default_location); +#else + sprintf(php_ini_search_path,".:%s:%s",env_location,default_location); +#endif + } else { + /* if path was set via -c flag, only look there */ + strcpy(php_ini_search_path,default_location); + } + PG(safe_mode) = 0; + PG(open_basedir) = NULL; + + + fh.handle.fp = php_fopen_with_path("php.ini", "r", php_ini_search_path, &opened_path); + free(php_ini_search_path); + if (free_default_location) { + free(default_location); + } + PG(safe_mode) = safe_mode_state; + PG(open_basedir) = open_basedir; + + if (!fh.handle.fp) { + return SUCCESS; /* having no configuration file is ok */ + } + fh.type = ZEND_HANDLE_FP; + fh.filename = opened_path; + + zend_parse_ini_file(&fh, 1, php_config_ini_parser_cb, NULL); + + if (opened_path) { + zval tmp; + + tmp.value.str.val = strdup(opened_path); + tmp.value.str.len = strlen(opened_path); + tmp.type = IS_STRING; + zend_hash_update(&configuration_hash,"cfg_file_path",sizeof("cfg_file_path"),(void *) &tmp,sizeof(zval),NULL); +#if DEBUG_CFG_PARSER + php_printf("INI file opened at '%s'\n",opened_path); +#endif + efree(opened_path); + } + } + +#endif + + return SUCCESS; +} + + +int php_shutdown_config(void) +{ + zend_hash_destroy(&configuration_hash); + return SUCCESS; +} + + +zval *cfg_get_entry(char *name, uint name_length) +{ + zval *tmp; + + if (zend_hash_find(&configuration_hash, name, name_length, (void **) &tmp)==SUCCESS) { + return tmp; + } else { + return NULL; + } +} + + +PHPAPI int cfg_get_long(char *varname,long *result) +{ + zval *tmp,var; + + if (zend_hash_find(&configuration_hash,varname,strlen(varname)+1,(void **) &tmp)==FAILURE) { + *result=(long)NULL; + return FAILURE; + } + var = *tmp; + zval_copy_ctor(&var); + convert_to_long(&var); + *result = var.value.lval; + return SUCCESS; +} + + +PHPAPI int cfg_get_double(char *varname,double *result) +{ + zval *tmp,var; + + if (zend_hash_find(&configuration_hash,varname,strlen(varname)+1,(void **) &tmp)==FAILURE) { + *result=(double)0; + return FAILURE; + } + var = *tmp; + zval_copy_ctor(&var); + convert_to_double(&var); + *result = var.value.dval; + return SUCCESS; +} + + +PHPAPI int cfg_get_string(char *varname, char **result) +{ + zval *tmp; + + if (zend_hash_find(&configuration_hash,varname,strlen(varname)+1,(void **) &tmp)==FAILURE) { + *result=NULL; + return FAILURE; + } + *result = tmp->value.str.val; + return SUCCESS; +} Index: php4/main/php_ini.h diff -u php4/main/php_ini.h:1.28 php4/main/php_ini.h:1.29 --- php4/main/php_ini.h:1.28 Sun Oct 29 14:42:01 2000 +++ php4/main/php_ini.h Mon Oct 30 15:39:14 2000 @@ -21,6 +21,9 @@ #include "zend_ini.h" +int php_init_config(void); +int php_shutdown_config(void); + #define PHP_INI_USER ZEND_INI_USER #define PHP_INI_PERDIR ZEND_INI_PERDIR #define PHP_INI_SYSTEM ZEND_INI_SYSTEM Index: php4/main/php_main.h diff -u php4/main/php_main.h:1.6 php4/main/php_main.h:1.7 --- php4/main/php_main.h:1.6 Sun Oct 29 08:00:42 2000 +++ php4/main/php_main.h Mon Oct 30 15:39:14 2000 @@ -18,7 +18,7 @@ */ -/* $Id: php_main.h,v 1.6 2000/10/29 16:00:42 sas Exp $ */ +/* $Id: php_main.h,v 1.7 2000/10/30 23:39:14 zeev Exp $ */ #ifndef PHP_MAIN_H @@ -48,11 +48,6 @@ PHPAPI int php_handle_auth_data(const char *auth SLS_DC); extern void php_call_shutdown_functions(void); - - -/* configuration module */ -extern int php_init_config(void); -extern int php_shutdown_config(void); /* environment module */ extern int php_init_environ(void); Index: php4/win32/php4.dsp diff -u php4/win32/php4.dsp:1.1 php4/win32/php4.dsp:1.2 --- php4/win32/php4.dsp:1.1 Wed Jun 14 11:06:31 2000 +++ php4/win32/php4.dsp Mon Oct 30 15:39:14 2000 @@ -43,7 +43,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I ".." /I "..\main" /I "..\Zend" /I "..\regex\\" /I "..\..\bindlib_w32" /D "NDEBUG" /D "_CONSOLE" /D ZEND_DEBUG=0 /D "MSVC5" /D "WIN32" /D "_MBCS" /D "ZEND_WIN32" /D "PHP_WIN32" /Fr /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I ".." /I "..\main" /I "..\Zend" /I "..\regex\\" /I "..\..\bindlib_w32" /I "..\TSRM" /D "NDEBUG" /D "_CONSOLE" /D ZEND_DEBUG=0 /D "MSVC5" /D "WIN32" /D "_MBCS" /D "ZEND_WIN32" /D "PHP_WIN32" /Fr /FD /c # SUBTRACT CPP /YX /Yc /Yu # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" @@ -68,7 +68,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I ".." /I "..\main" /I "..\Zend" /I "..\regex\\" /I "..\..\bindlib_w32" /D "DEBUG" /D "_DEBUG" /D "_CONSOLE" /D ZEND_DEBUG=1 /D "MSVC5" /D "WIN32" /D "_MBCS" /D "ZEND_WIN32" /D "PHP_WIN32" /FR /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I ".." /I "..\main" /I "..\Zend" /I "..\regex\\" /I "..\..\bindlib_w32" /I "..\TSRM" /D "DEBUG" /D "_DEBUG" /D "_CONSOLE" /D ZEND_DEBUG=1 /D "MSVC5" /D "WIN32" /D "_MBCS" /D "ZEND_WIN32" /D "PHP_WIN32" /FR /FD /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /i "c:\include" /d "_DEBUG" @@ -96,7 +96,7 @@ # PROP Target_Dir "" # ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "Zend" /I "." /I "regex\\" /I "..\bindlib_w32" /D "NDEBUG" /D "MSVC5" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D ZEND_DEBUG=0 /Fr /FD /c # SUBTRACT BASE CPP /YX /Yc /Yu -# ADD CPP /nologo /MD /W3 /GX /O2 /I ".." /I "..\main" /I "..\Zend" /I "..\regex\\" /I "..\..\bindlib_w32" /D "NDEBUG" /D "_CONSOLE" /D ZEND_DEBUG=0 /D "ZEND_WIN32_FORCE_INLINE" /D "MSVC5" /D "WIN32" /D "_MBCS" /D "ZEND_WIN32" /D "PHP_WIN32" /Fr /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I ".." /I "..\main" /I "..\Zend" /I "..\regex\\" /I "..\..\bindlib_w32" /I "..\TSRM" /D "NDEBUG" /D "_CONSOLE" /D ZEND_DEBUG=0 /D "ZEND_WIN32_FORCE_INLINE" /D "MSVC5" /D "WIN32" /D "_MBCS" /D "ZEND_WIN32" /D "PHP_WIN32" /Fr /FD /c # SUBTRACT CPP /YX /Yc /Yu # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" Index: php4/win32/php4.dsw diff -u php4/win32/php4.dsw:1.2 php4/win32/php4.dsw:1.3 --- php4/win32/php4.dsw:1.2 Sat Aug 19 12:05:22 2000 +++ php4/win32/php4.dsw Mon Oct 30 15:39:14 2000 @@ -3,6 +3,18 @@ ############################################################################### +Project: "TSRM"=..\TSRM\TSRM.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + Project: "Zend"=..\Zend\Zend.dsp - Package Owner=<4> Package=<5> @@ -55,6 +67,9 @@ End Project Dependency Begin Project Dependency Project_Dep_Name libmysql + End Project Dependency + Begin Project Dependency + Project_Dep_Name TSRM End Project Dependency }}} Index: php4/win32/php4dll.dsp diff -u php4/win32/php4dll.dsp:1.4 php4/win32/php4dll.dsp:1.5 --- php4/win32/php4dll.dsp:1.4 Tue Aug 22 08:18:26 2000 +++ php4/win32/php4dll.dsp Mon Oct 30 15:39:14 2000 @@ -44,7 +44,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I ".." /I "..\main" /I "..\Zend" /I "..\regex" /I "..\..\bindlib_w32" /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "SAPI_EXPORTS" /D "TSRM_EXPORTS" /D ZEND_DEBUG=1 /D "MSVC5" /D "WIN32" /D "_MBCS" /D "ZEND_WIN32" /D "PHP_WIN32" /FR /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I ".." /I "..\main" /I "..\Zend" /I "..\regex" /I "..\..\bindlib_w32" /I "..\TSRM" /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "SAPI_EXPORTS" /D "TSRM_EXPORTS" /D ZEND_DEBUG=1 /D "MSVC5" /D "WIN32" /D "_MBCS" /D "ZEND_WIN32" /D "PHP_WIN32" /FR /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x40d /d "_DEBUG" @@ -54,7 +54,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Zend.lib resolv.lib libmysql.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"libcmt" /nodefaultlib:"libc" /nodefaultlib:"libcmtd" /out:"..\Debug\php4nts_debug.dll" /pdbtype:sept /libpath:"..\TSRM\Debug" /libpath:"..\Zend\Debug" /libpath:"..\..\bindlib_w32\Debug" /libpath:"..\ext\mysql\libmysql\Debug" +# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Zend.lib resolv.lib libmysql.lib TSRM.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"libcmt" /nodefaultlib:"libc" /nodefaultlib:"libcmtd" /out:"..\Debug\php4nts_debug.dll" /pdbtype:sept /libpath:"..\TSRM\Debug_TS" /libpath:"..\Zend\Debug" /libpath:"..\..\bindlib_w32\Debug" /libpath:"..\ext\mysql\libmysql\Debug" !ELSEIF "$(CFG)" == "php4dll - Win32 Release" @@ -70,7 +70,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I ".." /I "..\main" /I "..\Zend" /I "..\regex" /I "..\..\bindlib_w32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLL_EXPORTS" /D "PHP_EXPORTS" /D "SAPI_EXPORTS" /D "LIBZEND_EXPORTS" /D ZEND_DEBUG=0 /D "MSVC5" /D "WIN32" /D "_MBCS" /D "ZEND_WIN32" /D "PHP_WIN32" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I ".." /I "..\main" /I "..\Zend" /I "..\regex" /I "..\..\bindlib_w32" /I "..\TSRM" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLL_EXPORTS" /D "PHP_EXPORTS" /D "SAPI_EXPORTS" /D "LIBZEND_EXPORTS" /D ZEND_DEBUG=0 /D "MSVC5" /D "WIN32" /D "_MBCS" /D "ZEND_WIN32" /D "PHP_WIN32" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x40d /d "NDEBUG" @@ -97,7 +97,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "Zend" /I "." /I "regex" /I "..\bindlib_w32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "MSVC5" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "SAPI_EXPORTS" /D ZEND_DEBUG=0 /D "TSRM_EXPORTS" /D "WIN32" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "Zend" /I "." /I "regex" /I "..\bindlib_w32" /I "main" /I ".." /I "..\main" /I "..\Zend" /I "..\regex" /I "..\..\bindlib_w32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "SAPI_EXPORTS" /D "TSRM_EXPORTS" /D ZEND_DEBUG=0 /D "ZEND_WIN32_FORCE_INLINE" /D "MSVC5" /D "WIN32" /D "_MBCS" /D "ZEND_WIN32" /D "PHP_WIN32" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "Zend" /I "." /I "regex" /I "..\bindlib_w32" /I "main" /I ".." /I "..\main" /I "..\Zend" /I "..\regex" /I "..\..\bindlib_w32" /I "..\TSRM" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "SAPI_EXPORTS" /D "TSRM_EXPORTS" /D ZEND_DEBUG=0 /D "ZEND_WIN32_FORCE_INLINE" /D "MSVC5" /D "WIN32" /D "_MBCS" /D "ZEND_WIN32" /D "PHP_WIN32" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x40d /d "NDEBUG" @@ -124,14 +124,6 @@ # PROP Default_Filter "" # Begin Source File -SOURCE="..\main\configuration-parser.c" -# End Source File -# Begin Source File - -SOURCE="..\main\configuration-scanner.c" -# End Source File -# Begin Source File - SOURCE=..\ext\standard\cyr_convert.c # End Source File # Begin Source File @@ -153,6 +145,10 @@ # End Source File # Begin Source File +SOURCE=..\main\network.c +# End Source File +# Begin Source File + SOURCE=..\ext\standard\output.c # End Source File # Begin Source File @@ -165,15 +161,15 @@ # End Source File # Begin Source File -SOURCE=..\main\php_ticks.c +SOURCE=..\main\php_open_temporary_file.c # End Source File # Begin Source File -SOURCE=..\main\php_variables.c +SOURCE=..\main\php_ticks.c # End Source File # Begin Source File -SOURCE=..\main\php_virtual_cwd.c +SOURCE=..\main\php_variables.c # End Source File # Begin Source File @@ -213,10 +209,6 @@ # End Source File # Begin Source File -SOURCE="..\main\configuration-parser.h" -# End Source File -# Begin Source File - SOURCE=..\ext\standard\cyr_convert.h # End Source File # Begin Source File @@ -261,19 +253,19 @@ # End Source File # Begin Source File -SOURCE=..\main\php_realpath.h +SOURCE=..\main\php_open_temporary_file.h # End Source File # Begin Source File -SOURCE=..\main\php_ticks.h +SOURCE=..\main\php_realpath.h # End Source File # Begin Source File -SOURCE=..\main\php_variables.h +SOURCE=..\main\php_ticks.h # End Source File # Begin Source File -SOURCE=..\main\php_virtual_cwd.h +SOURCE=..\main\php_variables.h # End Source File # Begin Source File @@ -373,6 +365,10 @@ # End Source File # Begin Source File +SOURCE=..\ext\standard\ftp_fopen_wrapper.c +# End Source File +# Begin Source File + SOURCE=..\ext\standard\head.c # End Source File # Begin Source File @@ -381,6 +377,10 @@ # End Source File # Begin Source File +SOURCE=..\ext\standard\http_fopen_wrapper.c +# End Source File +# Begin Source File + SOURCE=..\ext\standard\image.c # End Source File # Begin Source File @@ -453,6 +453,10 @@ # End Source File # Begin Source File +SOURCE=..\ext\standard\php_fopen_wrapper.c +# End Source File +# Begin Source File + SOURCE=..\ext\mysql\php_mysql.c # ADD CPP /I "..\ext\mysql\libmysql" # End Source File @@ -521,6 +525,14 @@ # End Source File # Begin Source File +SOURCE=..\ext\standard\url_scanner.c +# End Source File +# Begin Source File + +SOURCE=..\ext\standard\url_scanner_ex.c +# End Source File +# Begin Source File + SOURCE=..\ext\standard\var.c # End Source File # End Group @@ -609,6 +621,10 @@ # End Source File # Begin Source File +SOURCE=..\ext\standard\php_fopen_wrappers.h +# End Source File +# Begin Source File + SOURCE=..\ext\ldap\php_ldap.h # End Source File # Begin Source File @@ -667,6 +683,14 @@ SOURCE=..\ext\standard\url.h # End Source File +# Begin Source File + +SOURCE=..\ext\standard\url_scanner.h +# End Source File +# Begin Source File + +SOURCE=..\ext\standard\url_scanner_ex.h +# End Source File # End Group # Begin Group "Regular Expressions" @@ -887,6 +911,86 @@ # End Group # End Group # End Group +# Begin Group "FTP" + +# PROP Default_Filter "" +# Begin Group "Source Files No. 6" + +# PROP Default_Filter ".c" +# Begin Source File + +SOURCE=..\ext\ftp\ftp.c +# End Source File +# Begin Source File + +SOURCE=..\ext\ftp\php_ftp.c +# End Source File +# End Group +# Begin Group "Header Files No. 6" + +# PROP Default_Filter ".h" +# Begin Source File + +SOURCE=..\ext\ftp\ftp.h +# End Source File +# Begin Source File + +SOURCE=..\ext\ftp\php_ftp.h +# End Source File +# End Group +# End Group +# Begin Group "Calendar" + +# PROP Default_Filter "" +# Begin Group "Source Files No. 7" + +# PROP Default_Filter ".c" +# Begin Source File + +SOURCE=..\ext\calendar\cal_unix.c +# End Source File +# Begin Source File + +SOURCE=..\ext\calendar\calendar.c +# End Source File +# Begin Source File + +SOURCE=..\ext\calendar\dow.c +# End Source File +# Begin Source File + +SOURCE=..\ext\calendar\easter.c +# End Source File +# Begin Source File + +SOURCE=..\ext\calendar\french.c +# End Source File +# Begin Source File + +SOURCE=..\ext\calendar\gregor.c +# End Source File +# Begin Source File + +SOURCE=..\ext\calendar\jewish.c +# End Source File +# Begin Source File + +SOURCE=..\ext\calendar\julian.c +# End Source File +# End Group +# Begin Group "Header Files No. 7" + +# PROP Default_Filter ".h" +# Begin Source File + +SOURCE=..\ext\calendar\php_calendar.h +# End Source File +# Begin Source File + +SOURCE=..\ext\calendar\sdncal.h +# End Source File +# End Group +# End Group # End Group # Begin Group "Win32" @@ -989,67 +1093,6 @@ # PROP Default_Filter "" # Begin Source File -SOURCE="..\main\configuration-parser.y" - -!IF "$(CFG)" == "php4dll - Win32 Debug" - -# Begin Custom Build -InputPath="..\main\configuration-parser.y" - -BuildCmds= \ - cd ..\main \ - if not "X%CYGWIN%"=="X" bison --output=configuration-parser.c -v -d -S "%CYGWIN%\share\bison.simple" -p cfg configuration-parser.y \ - if "X%CYGWIN%"=="X" bison --output=configuration-parser.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" -p cfg configuration-parser.y \ - - -"..\main\configuration-parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) - -"..\main\configuration-parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) -# End Custom Build - -!ELSEIF "$(CFG)" == "php4dll - Win32 Release" - -# Begin Custom Build -InputPath="..\main\configuration-parser.y" - -BuildCmds= \ - cd ..\main \ - if not "X%CYGWIN%"=="X" bison --output=configuration-parser.c -v -d -S "%CYGWIN%\share\bison.simple" -p cfg configuration-parser.y \ - if "X%CYGWIN%"=="X" bison --output=configuration-parser.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" -p cfg configuration-parser.y \ - - -"..\main\configuration-parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) - -"..\main\configuration-parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) -# End Custom Build - -!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline" - -# Begin Custom Build -InputPath="..\main\configuration-parser.y" - -BuildCmds= \ - cd ..\main \ - if not "X%CYGWIN%"=="X" bison --output=configuration-parser.c -v -d -S "%CYGWIN%\share\bison.simple" -p cfg configuration-parser.y \ - if "X%CYGWIN%"=="X" bison --output=configuration-parser.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" -p cfg configuration-parser.y \ - - -"..\main\configuration-parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) - -"..\main\configuration-parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) -# End Custom Build - -!ENDIF - -# End Source File -# Begin Source File - SOURCE=..\ext\standard\parsedate.y !IF "$(CFG)" == "php4dll - Win32 Debug" @@ -1095,46 +1138,6 @@ # Begin Group "Scanners" # PROP Default_Filter "" -# Begin Source File - -SOURCE="..\main\configuration-scanner.l" - -!IF "$(CFG)" == "php4dll - Win32 Debug" - -# Begin Custom Build -InputPath="..\main\configuration-scanner.l" - -"..\main\configuration-scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - cd ..\main - flex -i -Pcfg -oconfiguration-scanner.c configuration-scanner.l - -# End Custom Build - -!ELSEIF "$(CFG)" == "php4dll - Win32 Release" - -# Begin Custom Build -InputPath="..\main\configuration-scanner.l" - -"..\main\configuration-scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - cd ..\main - flex -i -Pcfg -oconfiguration-scanner.c configuration-scanner.l - -# End Custom Build - -!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline" - -# Begin Custom Build -InputPath="..\main\configuration-scanner.l" - -"..\main\configuration-scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - cd ..\main - flex -i -Pcfg -oconfiguration-scanner.c configuration-scanner.l - -# End Custom Build - -!ENDIF - -# End Source File # End Group # Begin Group "Text Files" Index: php4/win32/php4dllts.dsp diff -u php4/win32/php4dllts.dsp:1.19 php4/win32/php4dllts.dsp:1.20 --- php4/win32/php4dllts.dsp:1.19 Fri Oct 13 02:13:01 2000 +++ php4/win32/php4dllts.dsp Mon Oct 30 15:39:14 2000 @@ -124,14 +124,6 @@ # PROP Default_Filter "" # Begin Source File -SOURCE="..\main\configuration-parser.c" -# End Source File -# Begin Source File - -SOURCE="..\main\configuration-scanner.c" -# End Source File -# Begin Source File - SOURCE=..\ext\standard\cyr_convert.c # End Source File # Begin Source File @@ -213,10 +205,6 @@ # End Source File # Begin Source File -SOURCE="..\main\configuration-parser.h" -# End Source File -# Begin Source File - SOURCE=..\ext\standard\cyr_convert.h # End Source File # Begin Source File @@ -237,10 +225,6 @@ # End Source File # Begin Source File -SOURCE=..\main\main.h -# End Source File -# Begin Source File - SOURCE=..\main\output.h # End Source File # Begin Source File @@ -269,6 +253,10 @@ # End Source File # Begin Source File +SOURCE=..\main\php_main.h +# End Source File +# Begin Source File + SOURCE=..\main\php_open_temporary_file.h # End Source File # Begin Source File @@ -1108,67 +1096,6 @@ # PROP Default_Filter "" # Begin Source File -SOURCE="..\main\configuration-parser.y" - -!IF "$(CFG)" == "php4dllts - Win32 Debug_TS" - -# Begin Custom Build -InputPath="..\main\configuration-parser.y" - -BuildCmds= \ - cd ..\main \ - if not "X%CYGWIN%"=="X" bison --output=configuration-parser.c -v -d -S "%CYGWIN%\share\bison.simple" -p cfg configuration-parser.y \ - if "X%CYGWIN%"=="X" bison --output=configuration-parser.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" -p cfg configuration-parser.y \ - - -"..\main\configuration-parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) - -"..\main\configuration-parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) -# End Custom Build - -!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS" - -# Begin Custom Build -InputPath="..\main\configuration-parser.y" - -BuildCmds= \ - cd ..\main \ - if not "X%CYGWIN%"=="X" bison --output=configuration-parser.c -v -d -S "%CYGWIN%\share\bison.simple" -p cfg configuration-parser.y \ - if "X%CYGWIN%"=="X" bison --output=configuration-parser.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" -p cfg configuration-parser.y \ - - -"..\main\configuration-parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) - -"..\main\configuration-parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) -# End Custom Build - -!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS_inline" - -# Begin Custom Build -InputPath="..\main\configuration-parser.y" - -BuildCmds= \ - cd ..\main \ - if not "X%CYGWIN%"=="X" bison --output=configuration-parser.c -v -d -S "%CYGWIN%\share\bison.simple" -p cfg configuration-parser.y \ - if "X%CYGWIN%"=="X" bison --output=configuration-parser.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" -p cfg configuration-parser.y \ - - -"..\main\configuration-parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) - -"..\main\configuration-parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) -# End Custom Build - -!ENDIF - -# End Source File -# Begin Source File - SOURCE=..\ext\standard\parsedate.y !IF "$(CFG)" == "php4dllts - Win32 Debug_TS" @@ -1214,46 +1141,6 @@ # Begin Group "Scanners" # PROP Default_Filter "" -# Begin Source File - -SOURCE="..\main\configuration-scanner.l" - -!IF "$(CFG)" == "php4dllts - Win32 Debug_TS" - -# Begin Custom Build -InputPath="..\main\configuration-scanner.l" - -"..\main\configuration-scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - cd ..\main - flex -i -Pcfg -oconfiguration-scanner.c configuration-scanner.l - -# End Custom Build - -!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS" - -# Begin Custom Build -InputPath="..\main\configuration-scanner.l" - -"..\main\configuration-scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - cd ..\main - flex -i -Pcfg -oconfiguration-scanner.c configuration-scanner.l - -# End Custom Build - -!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS_inline" - -# Begin Custom Build -InputPath="..\main\configuration-scanner.l" - -"..\main\configuration-scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - cd ..\main - flex -i -Pcfg -oconfiguration-scanner.c configuration-scanner.l - -# End Custom Build - -!ENDIF - -# End Source File # End Group # Begin Group "Text Files"
Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.273 php4/ext/standard/basic_functions.c:1.274 --- php4/ext/standard/basic_functions.c:1.273 Sun Oct 29 15:34:33 2000 +++ php4/ext/standard/basic_functions.c Mon Oct 30 15:39:14 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.c,v 1.273 2000/10/29 23:34:33 zeev Exp $ */ +/* $Id: basic_functions.c,v 1.274 2000/10/30 23:39:14 zeev Exp $ */ #include "php.h" #include "php_main.h" @@ -2402,14 +2402,15 @@ } convert_to_string_ex(filename); - fh.handle.fp = V_FOPEN((*filename)->value.str.val, "r"); + fh.handle.fp = V_FOPEN(Z_STRVAL_PP(filename), "r"); if (!fh.handle.fp) { php_error(E_WARNING,"Cannot open '%s' for reading", (*filename)->value.str.val); return; } fh.type = ZEND_HANDLE_FP; + fh.filename = Z_STRVAL_PP(filename); array_init(return_value); - zend_parse_ini_file(&fh, ini_parser_cb, return_value); + zend_parse_ini_file(&fh, 0, ini_parser_cb, return_value); } /* }}} */ Index: php4/ext/standard/browscap.c diff -u php4/ext/standard/browscap.c:1.36 php4/ext/standard/browscap.c:1.37 --- php4/ext/standard/browscap.c:1.36 Sun Oct 29 15:10:22 2000 +++ php4/ext/standard/browscap.c Mon Oct 30 15:39:14 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: browscap.c,v 1.36 2000/10/29 23:10:22 zeev Exp $ */ +/* $Id: browscap.c,v 1.37 2000/10/30 23:39:14 zeev Exp $ */ #include "php.h" #include "php_regex.h" @@ -33,7 +33,7 @@ static void browscap_entry_dtor(zval *pvalue) { - if (pvalue->type == IS_OBJECT || pvalue->type == IS_ARRAY) { + if (pvalue->type == IS_OBJECT) { zend_hash_destroy(pvalue->value.obj.properties); free(pvalue->value.obj.properties); } @@ -144,7 +144,8 @@ php_error(E_WARNING,"Cannot open '%s' for reading", browscap); return FAILURE; } - zend_parse_ini_file(&fh, (zend_ini_parser_cb_t) php_browscap_parser_cb, &browser_hash); + fh.filename = browscap; + zend_parse_ini_file(&fh, 1, (zend_ini_parser_cb_t) php_browscap_parser_cb, &browser_hash); } return SUCCESS; Index: php4/main/Makefile.in diff -u php4/main/Makefile.in:1.10 php4/main/Makefile.in:1.11 --- php4/main/Makefile.in:1.10 Wed Oct 11 23:32:10 2000 +++ php4/main/Makefile.in Mon Oct 30 15:39:14 2000 @@ -2,7 +2,6 @@ LTLIBRARY_SOURCES = \ main.c internal_functions.c snprintf.c php_sprintf.c \ - configuration-parser.c configuration-scanner.c \ safe_mode.c fopen-wrappers.c alloca.c \ php_ini.c SAPI.c rfc1867.c php_content_types.c strlcpy.c \ strlcat.c mergesort.c reentrancy.c php_variables.c php_ticks.c \ @@ -10,11 +9,6 @@ include $(top_srcdir)/build/ltlib.mk -configuration-parser.h configuration-parser.c: $(srcdir)/configuration-parser.y - $(YACC) -p cfg -v -d $< -o configuration-parser.c - -configuration-scanner.c: $(srcdir)/configuration-scanner.l - $(LEX) -Pcfg -o$@ -i $< internal_functions.c: $(srcdir)/internal_functions.c.in $(top_builddir)/config.status cd $(top_builddir) && \ Index: php4/main/php_ini.c diff -u php4/main/php_ini.c:1.42 php4/main/php_ini.c:1.43 --- php4/main/php_ini.c:1.42 Sun Oct 29 14:42:01 2000 +++ php4/main/php_ini.c Mon Oct 30 15:39:14 2000 @@ -20,8 +20,14 @@ #include "php.h" #include "ext/standard/info.h" #include "zend_ini.h" +#include "php_ini.h" +#include "ext/standard/dl.h" +#include "zend_extensions.h" +static HashTable configuration_hash; +PHPAPI extern char *php_ini_path; + static void php_ini_displayer_cb(zend_ini_entry *ini_entry, int type) { if (ini_entry->displayer) { @@ -83,3 +89,215 @@ php_info_print_table_end(); } + + +/* php.ini support */ + +#ifdef ZTS +# if (ZEND_DEBUG) +# define ZEND_EXTENSION_TOKEN "zend_extension_debug_ts" +# else +# define ZEND_EXTENSION_TOKEN "zend_extension_ts" +# endif +#else +# if (ZEND_DEBUG) +# define ZEND_EXTENSION_TOKEN "zend_extension_debug" +# else +# define ZEND_EXTENSION_TOKEN "zend_extension" +# endif +#endif + + +static void pvalue_config_destructor(zval *pvalue) +{ + if (pvalue->type == IS_STRING && pvalue->value.str.val != empty_string) { + free(pvalue->value.str.val); + } +} + + +static void php_config_ini_parser_cb(zval *arg1, zval *arg2, int callback_type, void *arg) +{ + switch (callback_type) { + case ZEND_INI_PARSER_ENTRY: { + zval *entry; + + if (!arg2) { + break; + } + if (!strcasecmp(Z_STRVAL_P(arg1), "extension")) { /* load function module */ + zval dummy; + + php_dl(arg2, MODULE_PERSISTENT, &dummy); + } else if (!strcasecmp(Z_STRVAL_P(arg1), ZEND_EXTENSION_TOKEN)) { /* load Zend extension */ + zend_load_extension(Z_STRVAL_P(arg2)); + } else { + zend_hash_update(&configuration_hash, Z_STRVAL_P(arg1), Z_STRLEN_P(arg1)+1, arg2, sizeof(zval), (void **) &entry); + Z_STRVAL_P(entry) = zend_strndup(Z_STRVAL_P(entry), Z_STRLEN_P(entry)); + php_alter_ini_entry(Z_STRVAL_P(arg1), Z_STRLEN_P(arg1)+1, Z_STRVAL_P(arg2), Z_STRLEN_P(arg2)+1, PHP_INI_SYSTEM, PHP_INI_STAGE_STARTUP); + } + } + break; + case ZEND_INI_PARSER_SECTION: + break; + } +} + + +int php_init_config(void) +{ + PLS_FETCH(); + + if (zend_hash_init(&configuration_hash, 0, NULL, (dtor_func_t) pvalue_config_destructor, 1)==FAILURE) { + return FAILURE; + } + +#if USE_CONFIG_FILE + { + char *env_location,*default_location,*php_ini_search_path; + int safe_mode_state = PG(safe_mode); + char *open_basedir = PG(open_basedir); + char *opened_path; + int free_default_location=0; + zend_file_handle fh; + + env_location = getenv("PHPRC"); + if (!env_location) { + env_location=""; + } +#ifdef PHP_WIN32 + { + if (php_ini_path) { + default_location = php_ini_path; + } else { + default_location = (char *) malloc(512); + + if (!GetWindowsDirectory(default_location,255)) { + default_location[0]=0; + } + free_default_location=1; + } + } +#else + if (!php_ini_path) { + default_location = CONFIGURATION_FILE_PATH; + } else { + default_location = php_ini_path; + } +#endif + +/* build a path */ + php_ini_search_path = (char *) malloc(sizeof(".")+strlen(env_location)+strlen(default_location)+2+1); + + if (!php_ini_path) { +#ifdef PHP_WIN32 + sprintf(php_ini_search_path,".;%s;%s",env_location,default_location); +#else + sprintf(php_ini_search_path,".:%s:%s",env_location,default_location); +#endif + } else { + /* if path was set via -c flag, only look there */ + strcpy(php_ini_search_path,default_location); + } + PG(safe_mode) = 0; + PG(open_basedir) = NULL; + + + fh.handle.fp = php_fopen_with_path("php.ini", "r", php_ini_search_path, &opened_path); + free(php_ini_search_path); + if (free_default_location) { + free(default_location); + } + PG(safe_mode) = safe_mode_state; + PG(open_basedir) = open_basedir; + + if (!fh.handle.fp) { + return SUCCESS; /* having no configuration file is ok */ + } + fh.type = ZEND_HANDLE_FP; + fh.filename = opened_path; + + zend_parse_ini_file(&fh, 1, php_config_ini_parser_cb, NULL); + + if (opened_path) { + zval tmp; + + tmp.value.str.val = strdup(opened_path); + tmp.value.str.len = strlen(opened_path); + tmp.type = IS_STRING; + zend_hash_update(&configuration_hash,"cfg_file_path",sizeof("cfg_file_path"),(void *) &tmp,sizeof(zval),NULL); +#if DEBUG_CFG_PARSER + php_printf("INI file opened at '%s'\n",opened_path); +#endif + efree(opened_path); + } + } + +#endif + + return SUCCESS; +} + + +int php_shutdown_config(void) +{ + zend_hash_destroy(&configuration_hash); + return SUCCESS; +} + + +zval *cfg_get_entry(char *name, uint name_length) +{ + zval *tmp; + + if (zend_hash_find(&configuration_hash, name, name_length, (void **) &tmp)==SUCCESS) { + return tmp; + } else { + return NULL; + } +} + + +PHPAPI int cfg_get_long(char *varname,long *result) +{ + zval *tmp,var; + + if (zend_hash_find(&configuration_hash,varname,strlen(varname)+1,(void **) &tmp)==FAILURE) { + *result=(long)NULL; + return FAILURE; + } + var = *tmp; + zval_copy_ctor(&var); + convert_to_long(&var); + *result = var.value.lval; + return SUCCESS; +} + + +PHPAPI int cfg_get_double(char *varname,double *result) +{ + zval *tmp,var; + + if (zend_hash_find(&configuration_hash,varname,strlen(varname)+1,(void **) &tmp)==FAILURE) { + *result=(double)0; + return FAILURE; + } + var = *tmp; + zval_copy_ctor(&var); + convert_to_double(&var); + *result = var.value.dval; + return SUCCESS; +} + + +PHPAPI int cfg_get_string(char *varname, char **result) +{ + zval *tmp; + + if (zend_hash_find(&configuration_hash,varname,strlen(varname)+1,(void **) &tmp)==FAILURE) { + *result=NULL; + return FAILURE; + } + *result = tmp->value.str.val; + return SUCCESS; +} Index: php4/main/php_ini.h diff -u php4/main/php_ini.h:1.28 php4/main/php_ini.h:1.29 --- php4/main/php_ini.h:1.28 Sun Oct 29 14:42:01 2000 +++ php4/main/php_ini.h Mon Oct 30 15:39:14 2000 @@ -21,6 +21,9 @@ #include "zend_ini.h" +int php_init_config(void); +int php_shutdown_config(void); + #define PHP_INI_USER ZEND_INI_USER #define PHP_INI_PERDIR ZEND_INI_PERDIR #define PHP_INI_SYSTEM ZEND_INI_SYSTEM Index: php4/main/php_main.h diff -u php4/main/php_main.h:1.6 php4/main/php_main.h:1.7 --- php4/main/php_main.h:1.6 Sun Oct 29 08:00:42 2000 +++ php4/main/php_main.h Mon Oct 30 15:39:14 2000 @@ -18,7 +18,7 @@ */ -/* $Id: php_main.h,v 1.6 2000/10/29 16:00:42 sas Exp $ */ +/* $Id: php_main.h,v 1.7 2000/10/30 23:39:14 zeev Exp $ */ #ifndef PHP_MAIN_H @@ -48,11 +48,6 @@ PHPAPI int php_handle_auth_data(const char *auth SLS_DC); extern void php_call_shutdown_functions(void); - - -/* configuration module */ -extern int php_init_config(void); -extern int php_shutdown_config(void); /* environment module */ extern int php_init_environ(void); Index: php4/win32/php4.dsp diff -u php4/win32/php4.dsp:1.1 php4/win32/php4.dsp:1.2 --- php4/win32/php4.dsp:1.1 Wed Jun 14 11:06:31 2000 +++ php4/win32/php4.dsp Mon Oct 30 15:39:14 2000 @@ -43,7 +43,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I ".." /I "..\main" /I "..\Zend" /I "..\regex\\" /I "..\..\bindlib_w32" /D "NDEBUG" /D "_CONSOLE" /D ZEND_DEBUG=0 /D "MSVC5" /D "WIN32" /D "_MBCS" /D "ZEND_WIN32" /D "PHP_WIN32" /Fr /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I ".." /I "..\main" /I "..\Zend" /I "..\regex\\" /I "..\..\bindlib_w32" /I "..\TSRM" /D "NDEBUG" /D "_CONSOLE" /D ZEND_DEBUG=0 /D "MSVC5" /D "WIN32" /D "_MBCS" /D "ZEND_WIN32" /D "PHP_WIN32" /Fr /FD /c # SUBTRACT CPP /YX /Yc /Yu # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" @@ -68,7 +68,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I ".." /I "..\main" /I "..\Zend" /I "..\regex\\" /I "..\..\bindlib_w32" /D "DEBUG" /D "_DEBUG" /D "_CONSOLE" /D ZEND_DEBUG=1 /D "MSVC5" /D "WIN32" /D "_MBCS" /D "ZEND_WIN32" /D "PHP_WIN32" /FR /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I ".." /I "..\main" /I "..\Zend" /I "..\regex\\" /I "..\..\bindlib_w32" /I "..\TSRM" /D "DEBUG" /D "_DEBUG" /D "_CONSOLE" /D ZEND_DEBUG=1 /D "MSVC5" /D "WIN32" /D "_MBCS" /D "ZEND_WIN32" /D "PHP_WIN32" /FR /FD /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /i "c:\include" /d "_DEBUG" @@ -96,7 +96,7 @@ # PROP Target_Dir "" # ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "Zend" /I "." /I "regex\\" /I "..\bindlib_w32" /D "NDEBUG" /D "MSVC5" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D ZEND_DEBUG=0 /Fr /FD /c # SUBTRACT BASE CPP /YX /Yc /Yu -# ADD CPP /nologo /MD /W3 /GX /O2 /I ".." /I "..\main" /I "..\Zend" /I "..\regex\\" /I "..\..\bindlib_w32" /D "NDEBUG" /D "_CONSOLE" /D ZEND_DEBUG=0 /D "ZEND_WIN32_FORCE_INLINE" /D "MSVC5" /D "WIN32" /D "_MBCS" /D "ZEND_WIN32" /D "PHP_WIN32" /Fr /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I ".." /I "..\main" /I "..\Zend" /I "..\regex\\" /I "..\..\bindlib_w32" /I "..\TSRM" /D "NDEBUG" /D "_CONSOLE" /D ZEND_DEBUG=0 /D "ZEND_WIN32_FORCE_INLINE" /D "MSVC5" /D "WIN32" /D "_MBCS" /D "ZEND_WIN32" /D "PHP_WIN32" /Fr /FD /c # SUBTRACT CPP /YX /Yc /Yu # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" Index: php4/win32/php4.dsw diff -u php4/win32/php4.dsw:1.2 php4/win32/php4.dsw:1.3 --- php4/win32/php4.dsw:1.2 Sat Aug 19 12:05:22 2000 +++ php4/win32/php4.dsw Mon Oct 30 15:39:14 2000 @@ -3,6 +3,18 @@ ############################################################################### +Project: "TSRM"=..\TSRM\TSRM.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + Project: "Zend"=..\Zend\Zend.dsp - Package Owner=<4> Package=<5> @@ -55,6 +67,9 @@ End Project Dependency Begin Project Dependency Project_Dep_Name libmysql + End Project Dependency + Begin Project Dependency + Project_Dep_Name TSRM End Project Dependency }}} Index: php4/win32/php4dll.dsp diff -u php4/win32/php4dll.dsp:1.4 php4/win32/php4dll.dsp:1.5 --- php4/win32/php4dll.dsp:1.4 Tue Aug 22 08:18:26 2000 +++ php4/win32/php4dll.dsp Mon Oct 30 15:39:14 2000 @@ -44,7 +44,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I ".." /I "..\main" /I "..\Zend" /I "..\regex" /I "..\..\bindlib_w32" /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "SAPI_EXPORTS" /D "TSRM_EXPORTS" /D ZEND_DEBUG=1 /D "MSVC5" /D "WIN32" /D "_MBCS" /D "ZEND_WIN32" /D "PHP_WIN32" /FR /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I ".." /I "..\main" /I "..\Zend" /I "..\regex" /I "..\..\bindlib_w32" /I "..\TSRM" /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "SAPI_EXPORTS" /D "TSRM_EXPORTS" /D ZEND_DEBUG=1 /D "MSVC5" /D "WIN32" /D "_MBCS" /D "ZEND_WIN32" /D "PHP_WIN32" /FR /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x40d /d "_DEBUG" @@ -54,7 +54,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Zend.lib resolv.lib libmysql.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"libcmt" /nodefaultlib:"libc" /nodefaultlib:"libcmtd" /out:"..\Debug\php4nts_debug.dll" /pdbtype:sept /libpath:"..\TSRM\Debug" /libpath:"..\Zend\Debug" /libpath:"..\..\bindlib_w32\Debug" /libpath:"..\ext\mysql\libmysql\Debug" +# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Zend.lib resolv.lib libmysql.lib TSRM.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"libcmt" /nodefaultlib:"libc" /nodefaultlib:"libcmtd" /out:"..\Debug\php4nts_debug.dll" /pdbtype:sept /libpath:"..\TSRM\Debug_TS" /libpath:"..\Zend\Debug" /libpath:"..\..\bindlib_w32\Debug" /libpath:"..\ext\mysql\libmysql\Debug" !ELSEIF "$(CFG)" == "php4dll - Win32 Release" @@ -70,7 +70,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I ".." /I "..\main" /I "..\Zend" /I "..\regex" /I "..\..\bindlib_w32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLL_EXPORTS" /D "PHP_EXPORTS" /D "SAPI_EXPORTS" /D "LIBZEND_EXPORTS" /D ZEND_DEBUG=0 /D "MSVC5" /D "WIN32" /D "_MBCS" /D "ZEND_WIN32" /D "PHP_WIN32" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I ".." /I "..\main" /I "..\Zend" /I "..\regex" /I "..\..\bindlib_w32" /I "..\TSRM" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLL_EXPORTS" /D "PHP_EXPORTS" /D "SAPI_EXPORTS" /D "LIBZEND_EXPORTS" /D ZEND_DEBUG=0 /D "MSVC5" /D "WIN32" /D "_MBCS" /D "ZEND_WIN32" /D "PHP_WIN32" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x40d /d "NDEBUG" @@ -97,7 +97,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "Zend" /I "." /I "regex" /I "..\bindlib_w32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "MSVC5" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "SAPI_EXPORTS" /D ZEND_DEBUG=0 /D "TSRM_EXPORTS" /D "WIN32" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "Zend" /I "." /I "regex" /I "..\bindlib_w32" /I "main" /I ".." /I "..\main" /I "..\Zend" /I "..\regex" /I "..\..\bindlib_w32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "SAPI_EXPORTS" /D "TSRM_EXPORTS" /D ZEND_DEBUG=0 /D "ZEND_WIN32_FORCE_INLINE" /D "MSVC5" /D "WIN32" /D "_MBCS" /D "ZEND_WIN32" /D "PHP_WIN32" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "Zend" /I "." /I "regex" /I "..\bindlib_w32" /I "main" /I ".." /I "..\main" /I "..\Zend" /I "..\regex" /I "..\..\bindlib_w32" /I "..\TSRM" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "SAPI_EXPORTS" /D "TSRM_EXPORTS" /D ZEND_DEBUG=0 /D "ZEND_WIN32_FORCE_INLINE" /D "MSVC5" /D "WIN32" /D "_MBCS" /D "ZEND_WIN32" /D "PHP_WIN32" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x40d /d "NDEBUG" @@ -124,14 +124,6 @@ # PROP Default_Filter "" # Begin Source File -SOURCE="..\main\configuration-parser.c" -# End Source File -# Begin Source File - -SOURCE="..\main\configuration-scanner.c" -# End Source File -# Begin Source File - SOURCE=..\ext\standard\cyr_convert.c # End Source File # Begin Source File @@ -153,6 +145,10 @@ # End Source File # Begin Source File +SOURCE=..\main\network.c +# End Source File +# Begin Source File + SOURCE=..\ext\standard\output.c # End Source File # Begin Source File @@ -165,15 +161,15 @@ # End Source File # Begin Source File -SOURCE=..\main\php_ticks.c +SOURCE=..\main\php_open_temporary_file.c # End Source File # Begin Source File -SOURCE=..\main\php_variables.c +SOURCE=..\main\php_ticks.c # End Source File # Begin Source File -SOURCE=..\main\php_virtual_cwd.c +SOURCE=..\main\php_variables.c # End Source File # Begin Source File @@ -213,10 +209,6 @@ # End Source File # Begin Source File -SOURCE="..\main\configuration-parser.h" -# End Source File -# Begin Source File - SOURCE=..\ext\standard\cyr_convert.h # End Source File # Begin Source File @@ -261,19 +253,19 @@ # End Source File # Begin Source File -SOURCE=..\main\php_realpath.h +SOURCE=..\main\php_open_temporary_file.h # End Source File # Begin Source File -SOURCE=..\main\php_ticks.h +SOURCE=..\main\php_realpath.h # End Source File # Begin Source File -SOURCE=..\main\php_variables.h +SOURCE=..\main\php_ticks.h # End Source File # Begin Source File -SOURCE=..\main\php_virtual_cwd.h +SOURCE=..\main\php_variables.h # End Source File # Begin Source File @@ -373,6 +365,10 @@ # End Source File # Begin Source File +SOURCE=..\ext\standard\ftp_fopen_wrapper.c +# End Source File +# Begin Source File + SOURCE=..\ext\standard\head.c # End Source File # Begin Source File @@ -381,6 +377,10 @@ # End Source File # Begin Source File +SOURCE=..\ext\standard\http_fopen_wrapper.c +# End Source File +# Begin Source File + SOURCE=..\ext\standard\image.c # End Source File # Begin Source File @@ -453,6 +453,10 @@ # End Source File # Begin Source File +SOURCE=..\ext\standard\php_fopen_wrapper.c +# End Source File +# Begin Source File + SOURCE=..\ext\mysql\php_mysql.c # ADD CPP /I "..\ext\mysql\libmysql" # End Source File @@ -521,6 +525,14 @@ # End Source File # Begin Source File +SOURCE=..\ext\standard\url_scanner.c +# End Source File +# Begin Source File + +SOURCE=..\ext\standard\url_scanner_ex.c +# End Source File +# Begin Source File + SOURCE=..\ext\standard\var.c # End Source File # End Group @@ -609,6 +621,10 @@ # End Source File # Begin Source File +SOURCE=..\ext\standard\php_fopen_wrappers.h +# End Source File +# Begin Source File + SOURCE=..\ext\ldap\php_ldap.h # End Source File # Begin Source File @@ -667,6 +683,14 @@ SOURCE=..\ext\standard\url.h # End Source File +# Begin Source File + +SOURCE=..\ext\standard\url_scanner.h +# End Source File +# Begin Source File + +SOURCE=..\ext\standard\url_scanner_ex.h +# End Source File # End Group # Begin Group "Regular Expressions" @@ -887,6 +911,86 @@ # End Group # End Group # End Group +# Begin Group "FTP" + +# PROP Default_Filter "" +# Begin Group "Source Files No. 6" + +# PROP Default_Filter ".c" +# Begin Source File + +SOURCE=..\ext\ftp\ftp.c +# End Source File +# Begin Source File + +SOURCE=..\ext\ftp\php_ftp.c +# End Source File +# End Group +# Begin Group "Header Files No. 6" + +# PROP Default_Filter ".h" +# Begin Source File + +SOURCE=..\ext\ftp\ftp.h +# End Source File +# Begin Source File + +SOURCE=..\ext\ftp\php_ftp.h +# End Source File +# End Group +# End Group +# Begin Group "Calendar" + +# PROP Default_Filter "" +# Begin Group "Source Files No. 7" + +# PROP Default_Filter ".c" +# Begin Source File + +SOURCE=..\ext\calendar\cal_unix.c +# End Source File +# Begin Source File + +SOURCE=..\ext\calendar\calendar.c +# End Source File +# Begin Source File + +SOURCE=..\ext\calendar\dow.c +# End Source File +# Begin Source File + +SOURCE=..\ext\calendar\easter.c +# End Source File +# Begin Source File + +SOURCE=..\ext\calendar\french.c +# End Source File +# Begin Source File + +SOURCE=..\ext\calendar\gregor.c +# End Source File +# Begin Source File + +SOURCE=..\ext\calendar\jewish.c +# End Source File +# Begin Source File + +SOURCE=..\ext\calendar\julian.c +# End Source File +# End Group +# Begin Group "Header Files No. 7" + +# PROP Default_Filter ".h" +# Begin Source File + +SOURCE=..\ext\calendar\php_calendar.h +# End Source File +# Begin Source File + +SOURCE=..\ext\calendar\sdncal.h +# End Source File +# End Group +# End Group # End Group # Begin Group "Win32" @@ -989,67 +1093,6 @@ # PROP Default_Filter "" # Begin Source File -SOURCE="..\main\configuration-parser.y" - -!IF "$(CFG)" == "php4dll - Win32 Debug" - -# Begin Custom Build -InputPath="..\main\configuration-parser.y" - -BuildCmds= \ - cd ..\main \ - if not "X%CYGWIN%"=="X" bison --output=configuration-parser.c -v -d -S "%CYGWIN%\share\bison.simple" -p cfg configuration-parser.y \ - if "X%CYGWIN%"=="X" bison --output=configuration-parser.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" -p cfg configuration-parser.y \ - - -"..\main\configuration-parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) - -"..\main\configuration-parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) -# End Custom Build - -!ELSEIF "$(CFG)" == "php4dll - Win32 Release" - -# Begin Custom Build -InputPath="..\main\configuration-parser.y" - -BuildCmds= \ - cd ..\main \ - if not "X%CYGWIN%"=="X" bison --output=configuration-parser.c -v -d -S "%CYGWIN%\share\bison.simple" -p cfg configuration-parser.y \ - if "X%CYGWIN%"=="X" bison --output=configuration-parser.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" -p cfg configuration-parser.y \ - - -"..\main\configuration-parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) - -"..\main\configuration-parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) -# End Custom Build - -!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline" - -# Begin Custom Build -InputPath="..\main\configuration-parser.y" - -BuildCmds= \ - cd ..\main \ - if not "X%CYGWIN%"=="X" bison --output=configuration-parser.c -v -d -S "%CYGWIN%\share\bison.simple" -p cfg configuration-parser.y \ - if "X%CYGWIN%"=="X" bison --output=configuration-parser.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" -p cfg configuration-parser.y \ - - -"..\main\configuration-parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) - -"..\main\configuration-parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) -# End Custom Build - -!ENDIF - -# End Source File -# Begin Source File - SOURCE=..\ext\standard\parsedate.y !IF "$(CFG)" == "php4dll - Win32 Debug" @@ -1095,46 +1138,6 @@ # Begin Group "Scanners" # PROP Default_Filter "" -# Begin Source File - -SOURCE="..\main\configuration-scanner.l" - -!IF "$(CFG)" == "php4dll - Win32 Debug" - -# Begin Custom Build -InputPath="..\main\configuration-scanner.l" - -"..\main\configuration-scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - cd ..\main - flex -i -Pcfg -oconfiguration-scanner.c configuration-scanner.l - -# End Custom Build - -!ELSEIF "$(CFG)" == "php4dll - Win32 Release" - -# Begin Custom Build -InputPath="..\main\configuration-scanner.l" - -"..\main\configuration-scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - cd ..\main - flex -i -Pcfg -oconfiguration-scanner.c configuration-scanner.l - -# End Custom Build - -!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline" - -# Begin Custom Build -InputPath="..\main\configuration-scanner.l" - -"..\main\configuration-scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - cd ..\main - flex -i -Pcfg -oconfiguration-scanner.c configuration-scanner.l - -# End Custom Build - -!ENDIF - -# End Source File # End Group # Begin Group "Text Files" Index: php4/win32/php4dllts.dsp diff -u php4/win32/php4dllts.dsp:1.19 php4/win32/php4dllts.dsp:1.20 --- php4/win32/php4dllts.dsp:1.19 Fri Oct 13 02:13:01 2000 +++ php4/win32/php4dllts.dsp Mon Oct 30 15:39:14 2000 @@ -124,14 +124,6 @@ # PROP Default_Filter "" # Begin Source File -SOURCE="..\main\configuration-parser.c" -# End Source File -# Begin Source File - -SOURCE="..\main\configuration-scanner.c" -# End Source File -# Begin Source File - SOURCE=..\ext\standard\cyr_convert.c # End Source File # Begin Source File @@ -213,10 +205,6 @@ # End Source File # Begin Source File -SOURCE="..\main\configuration-parser.h" -# End Source File -# Begin Source File - SOURCE=..\ext\standard\cyr_convert.h # End Source File # Begin Source File @@ -237,10 +225,6 @@ # End Source File # Begin Source File -SOURCE=..\main\main.h -# End Source File -# Begin Source File - SOURCE=..\main\output.h # End Source File # Begin Source File @@ -269,6 +253,10 @@ # End Source File # Begin Source File +SOURCE=..\main\php_main.h +# End Source File +# Begin Source File + SOURCE=..\main\php_open_temporary_file.h # End Source File # Begin Source File @@ -1108,67 +1096,6 @@ # PROP Default_Filter "" # Begin Source File -SOURCE="..\main\configuration-parser.y" - -!IF "$(CFG)" == "php4dllts - Win32 Debug_TS" - -# Begin Custom Build -InputPath="..\main\configuration-parser.y" - -BuildCmds= \ - cd ..\main \ - if not "X%CYGWIN%"=="X" bison --output=configuration-parser.c -v -d -S "%CYGWIN%\share\bison.simple" -p cfg configuration-parser.y \ - if "X%CYGWIN%"=="X" bison --output=configuration-parser.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" -p cfg configuration-parser.y \ - - -"..\main\configuration-parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) - -"..\main\configuration-parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) -# End Custom Build - -!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS" - -# Begin Custom Build -InputPath="..\main\configuration-parser.y" - -BuildCmds= \ - cd ..\main \ - if not "X%CYGWIN%"=="X" bison --output=configuration-parser.c -v -d -S "%CYGWIN%\share\bison.simple" -p cfg configuration-parser.y \ - if "X%CYGWIN%"=="X" bison --output=configuration-parser.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" -p cfg configuration-parser.y \ - - -"..\main\configuration-parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) - -"..\main\configuration-parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) -# End Custom Build - -!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS_inline" - -# Begin Custom Build -InputPath="..\main\configuration-parser.y" - -BuildCmds= \ - cd ..\main \ - if not "X%CYGWIN%"=="X" bison --output=configuration-parser.c -v -d -S "%CYGWIN%\share\bison.simple" -p cfg configuration-parser.y \ - if "X%CYGWIN%"=="X" bison --output=configuration-parser.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" -p cfg configuration-parser.y \ - - -"..\main\configuration-parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) - -"..\main\configuration-parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) -# End Custom Build - -!ENDIF - -# End Source File -# Begin Source File - SOURCE=..\ext\standard\parsedate.y !IF "$(CFG)" == "php4dllts - Win32 Debug_TS" @@ -1214,46 +1141,6 @@ # Begin Group "Scanners" # PROP Default_Filter "" -# Begin Source File - -SOURCE="..\main\configuration-scanner.l" - -!IF "$(CFG)" == "php4dllts - Win32 Debug_TS" - -# Begin Custom Build -InputPath="..\main\configuration-scanner.l" - -"..\main\configuration-scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - cd ..\main - flex -i -Pcfg -oconfiguration-scanner.c configuration-scanner.l - -# End Custom Build - -!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS" - -# Begin Custom Build -InputPath="..\main\configuration-scanner.l" - -"..\main\configuration-scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - cd ..\main - flex -i -Pcfg -oconfiguration-scanner.c configuration-scanner.l - -# End Custom Build - -!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS_inline" - -# Begin Custom Build -InputPath="..\main\configuration-scanner.l" - -"..\main\configuration-scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - cd ..\main - flex -i -Pcfg -oconfiguration-scanner.c configuration-scanner.l - -# End Custom Build - -!ENDIF - -# End Source File # End Group # Begin Group "Text Files"