Fossil SCM
For the "setenv:" line of CGI scripts, if the VALUE field is omitted, unset the variable.
Commit
72df287cf3556a04a8321e578485184ad75964cf
Parent
0e9a144ba7f9783…
1 file changed
+5
-3
+5
-3
| --- src/main.c | ||
| +++ src/main.c | ||
| @@ -2141,16 +2141,18 @@ | ||
| 2141 | 2141 | */ |
| 2142 | 2142 | pFileGlob = glob_create(blob_str(&value)); |
| 2143 | 2143 | blob_reset(&value); |
| 2144 | 2144 | continue; |
| 2145 | 2145 | } |
| 2146 | - if( blob_eq(&key, "setenv:") && blob_token(&line, &value) | |
| 2147 | - && blob_token(&line, &value2) ){ | |
| 2146 | + if( blob_eq(&key, "setenv:") && blob_token(&line, &value) ){ | |
| 2148 | 2147 | /* setenv: NAME VALUE |
| 2148 | + ** setenv: NAME | |
| 2149 | 2149 | ** |
| 2150 | - ** Sets environment variable NAME to VALUE | |
| 2150 | + ** Sets environment variable NAME to VALUE. If VALUE is omitted, then | |
| 2151 | + ** the environment variable is unset. | |
| 2151 | 2152 | */ |
| 2153 | + blob_token(&line,&value2); | |
| 2152 | 2154 | fossil_setenv(blob_str(&value), blob_str(&value2)); |
| 2153 | 2155 | blob_reset(&value); |
| 2154 | 2156 | blob_reset(&value2); |
| 2155 | 2157 | continue; |
| 2156 | 2158 | } |
| 2157 | 2159 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -2141,16 +2141,18 @@ | |
| 2141 | */ |
| 2142 | pFileGlob = glob_create(blob_str(&value)); |
| 2143 | blob_reset(&value); |
| 2144 | continue; |
| 2145 | } |
| 2146 | if( blob_eq(&key, "setenv:") && blob_token(&line, &value) |
| 2147 | && blob_token(&line, &value2) ){ |
| 2148 | /* setenv: NAME VALUE |
| 2149 | ** |
| 2150 | ** Sets environment variable NAME to VALUE |
| 2151 | */ |
| 2152 | fossil_setenv(blob_str(&value), blob_str(&value2)); |
| 2153 | blob_reset(&value); |
| 2154 | blob_reset(&value2); |
| 2155 | continue; |
| 2156 | } |
| 2157 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -2141,16 +2141,18 @@ | |
| 2141 | */ |
| 2142 | pFileGlob = glob_create(blob_str(&value)); |
| 2143 | blob_reset(&value); |
| 2144 | continue; |
| 2145 | } |
| 2146 | if( blob_eq(&key, "setenv:") && blob_token(&line, &value) ){ |
| 2147 | /* setenv: NAME VALUE |
| 2148 | ** setenv: NAME |
| 2149 | ** |
| 2150 | ** Sets environment variable NAME to VALUE. If VALUE is omitted, then |
| 2151 | ** the environment variable is unset. |
| 2152 | */ |
| 2153 | blob_token(&line,&value2); |
| 2154 | fossil_setenv(blob_str(&value), blob_str(&value2)); |
| 2155 | blob_reset(&value); |
| 2156 | blob_reset(&value2); |
| 2157 | continue; |
| 2158 | } |
| 2159 |