Somehow the rules for the configuration parser/scanners disappeared

diff --git a/main/configuration-parser.y b/main/configuration-parser.y
index 79153c10eecda556f704c62ac966a60309930cde..d5ca60105106f62f366f8f8e8a4bf344f3c1bd17 100644 (file)
--- a/main/configuration-parser.y
+++ b/main/configuration-parser.y
@@ -347,6 +347,7 @@ static void convert_browscap_pattern(pval *pattern)
 %token CFG_FALSE
 %token EXTENSION
 %token T_ZEND_EXTENSION
+%token T_ZEND_EXTENSION_TS
 
 %%
 
@@ -378,7 +379,18 @@ statement:
                        
                        php3_dl(&$3,MODULE_PERSISTENT,&dummy);
                }
-       |       T_ZEND_EXTENSION '=' string {    zend_load_extension($3.value.str.val); free($3.value.str.val); }
+       |       T_ZEND_EXTENSION '=' string {
+#ifndef ZTS
+                       zend_load_extension($3.value.str.val);
+#endif
+                       free($3.value.str.val);
+               }
+       |       T_ZEND_EXTENSION_TS '=' string { 
+#ifdef ZTS
+                       zend_load_extension($3.value.str.val);
+#endif
+                       free($3.value.str.val);
+               }
        |       SECTION { 
                        if (parsing_mode==PARSING_MODE_BROWSCAP) {
                                pval tmp;

diff --git a/main/configuration-scanner.l b/main/configuration-scanner.l
index 096a4a8248ae87d1fa4ea6165a89ecf3d38828c2..709fbbbe64f8ac482173bf898d68a679cc8dca99 100644 (file)
--- a/main/configuration-scanner.l
+++ b/main/configuration-scanner.l
@@ -59,6 +59,11 @@ void init_cfg_scanner()
        return T_ZEND_EXTENSION;
 }
 
+
+<INITIAL>"zend_extension_ts" {
+       return T_ZEND_EXTENSION_TS;
+}
+
 <INITIAL>[ ]*("true"|"on"|"yes")[ ]* {
        cfglval->value.str.val = php3_strndup("1",1);
        cfglval->value.str.len = 1;

diff --git a/php4dll.dsp b/php4dll.dsp
index e3e4a40b9a52ff5442d8fcc1c22dc8009ab8308c..d8d27a8e9cadf259fb404288e9fdbc387d310f4f 100644 (file)
--- a/php4dll.dsp
+++ b/php4dll.dsp
@@ -653,6 +653,39 @@ SOURCE=.\win32\wfile.h
 # Begin Source File\r
 \r
 SOURCE=".\configuration-parser.y"\r
+\r
+!IF  "$(CFG)" == "php4dll - Win32 Debug"\r
+\r
+# Begin Custom Build\r
+InputPath=".\configuration-parser.y"\r
+\r
+BuildCmds= \\r
+       bison --output=configuration-parser.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" -p cfg configuration-parser.y\r
+\r
+"configuration-parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+   $(BuildCmds)\r
+\r
+"configuration-parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+   $(BuildCmds)\r
+# End Custom Build\r
+\r
+!ELSEIF  "$(CFG)" == "php4dll - Win32 Release"\r
+\r
+# Begin Custom Build\r
+InputPath=".\configuration-parser.y"\r
+\r
+BuildCmds= \\r
+       bison --output=configuration-parser.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" -p cfg configuration-parser.y\r
+\r
+"configuration-parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+   $(BuildCmds)\r
+\r
+"configuration-parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+   $(BuildCmds)\r
+# End Custom Build\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # End Group\r
 # Begin Group "Scanners"\r
@@ -661,6 +694,29 @@ SOURCE=".\configuration-parser.y"
 # Begin Source File\r
 \r
 SOURCE=".\configuration-scanner.l"\r
+\r
+!IF  "$(CFG)" == "php4dll - Win32 Debug"\r
+\r
+# Begin Custom Build\r
+InputPath=".\configuration-scanner.l"\r
+\r
+"configuration-scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+       flex -i -Pcfg -oconfiguration-scanner.c configuration-scanner.l\r
+\r
+# End Custom Build\r
+\r
+!ELSEIF  "$(CFG)" == "php4dll - Win32 Release"\r
+\r
+# Begin Custom Build\r
+InputPath=".\configuration-scanner.l"\r
+\r
+"configuration-scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+       flex -i -Pcfg -oconfiguration-scanner.c configuration-scanner.l\r
+\r
+# End Custom Build\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # End Group\r
 # End Target\r

diff --git a/php4dllts.dsp b/php4dllts.dsp
index 4dbe174bd9edf83b1d714c5bb112a8ddb3bf91fe..8c9da25a1c355e0257ef0ac117ef091dae051b5d 100644 (file)
--- a/php4dllts.dsp
+++ b/php4dllts.dsp
@@ -653,6 +653,39 @@ SOURCE=.\win32\wfile.h
 # Begin Source File\r
 \r
 SOURCE=".\configuration-parser.y"\r
+\r
+!IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"\r
+\r
+# Begin Custom Build\r
+InputPath=".\configuration-parser.y"\r
+\r
+BuildCmds= \\r
+       bison --output=configuration-parser.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" -p cfg configuration-parser.y\r
+\r
+"configuration-parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+   $(BuildCmds)\r
+\r
+"configuration-parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+   $(BuildCmds)\r
+# End Custom Build\r
+\r
+!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"\r
+\r
+# Begin Custom Build\r
+InputPath=".\configuration-parser.y"\r
+\r
+BuildCmds= \\r
+       bison --output=configuration-parser.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" -p cfg configuration-parser.y\r
+\r
+"configuration-parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+   $(BuildCmds)\r
+\r
+"configuration-parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+   $(BuildCmds)\r
+# End Custom Build\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # End Group\r
 # Begin Group "Scanners"\r
@@ -661,6 +694,29 @@ SOURCE=".\configuration-parser.y"
 # Begin Source File\r
 \r
 SOURCE=".\configuration-scanner.l"\r
+\r
+!IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"\r
+\r
+# Begin Custom Build\r
+InputPath=".\configuration-scanner.l"\r
+\r
+"configuration-scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+       flex -i -Pcfg -oconfiguration-scanner.c configuration-scanner.l\r
+\r
+# End Custom Build\r
+\r
+!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"\r
+\r
+# Begin Custom Build\r
+InputPath=".\configuration-scanner.l"\r
+\r
+"configuration-scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+       flex -i -Pcfg -oconfiguration-scanner.c configuration-scanner.l\r
+\r
+# End Custom Build\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # End Group\r
 # End Target\r