Fossil SCM
Add the g.zExtra output to the test_env page. Fix a bug in the computation of g.zTop.
Commit
1ce716b2ecf72a18fdeef0f7460193180970203b
Parent
218577e3aff9282…
2 files changed
+2
-2
+2
-1
+2
-2
| --- src/main.c | ||
| +++ src/main.c | ||
| @@ -438,14 +438,14 @@ | ||
| 438 | 438 | while( i>0 && zCur[i-1]!='/' ){ i--; } |
| 439 | 439 | while( i>0 && zCur[i-1]=='/' ){ i--; } |
| 440 | 440 | |
| 441 | 441 | if( strcmp(zMode,"on")==0 ){ |
| 442 | 442 | g.zBaseURL = mprintf("https://%s%.*s", zHost, i, zCur); |
| 443 | - g.zTop = &g.zBaseURL[8+strlen(zHost)+i]; | |
| 443 | + g.zTop = &g.zBaseURL[8+strlen(zHost)]; | |
| 444 | 444 | }else{ |
| 445 | 445 | g.zBaseURL = mprintf("http://%s%.*s", zHost, i, zCur); |
| 446 | - g.zTop = &g.zBaseURL[7+strlen(zHost)+i]; | |
| 446 | + g.zTop = &g.zBaseURL[7+strlen(zHost)]; | |
| 447 | 447 | } |
| 448 | 448 | } |
| 449 | 449 | |
| 450 | 450 | /* |
| 451 | 451 | ** Preconditions: |
| 452 | 452 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -438,14 +438,14 @@ | |
| 438 | while( i>0 && zCur[i-1]!='/' ){ i--; } |
| 439 | while( i>0 && zCur[i-1]=='/' ){ i--; } |
| 440 | |
| 441 | if( strcmp(zMode,"on")==0 ){ |
| 442 | g.zBaseURL = mprintf("https://%s%.*s", zHost, i, zCur); |
| 443 | g.zTop = &g.zBaseURL[8+strlen(zHost)+i]; |
| 444 | }else{ |
| 445 | g.zBaseURL = mprintf("http://%s%.*s", zHost, i, zCur); |
| 446 | g.zTop = &g.zBaseURL[7+strlen(zHost)+i]; |
| 447 | } |
| 448 | } |
| 449 | |
| 450 | /* |
| 451 | ** Preconditions: |
| 452 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -438,14 +438,14 @@ | |
| 438 | while( i>0 && zCur[i-1]!='/' ){ i--; } |
| 439 | while( i>0 && zCur[i-1]=='/' ){ i--; } |
| 440 | |
| 441 | if( strcmp(zMode,"on")==0 ){ |
| 442 | g.zBaseURL = mprintf("https://%s%.*s", zHost, i, zCur); |
| 443 | g.zTop = &g.zBaseURL[8+strlen(zHost)]; |
| 444 | }else{ |
| 445 | g.zBaseURL = mprintf("http://%s%.*s", zHost, i, zCur); |
| 446 | g.zTop = &g.zBaseURL[7+strlen(zHost)]; |
| 447 | } |
| 448 | } |
| 449 | |
| 450 | /* |
| 451 | ** Preconditions: |
| 452 |
+2
-1
| --- src/style.c | ||
| +++ src/style.c | ||
| @@ -238,9 +238,10 @@ | ||
| 238 | 238 | ** WEBPAGE: test_env |
| 239 | 239 | */ |
| 240 | 240 | void page_test_env(void){ |
| 241 | 241 | style_header("Environment Test"); |
| 242 | 242 | @ g.zBaseURL = %h(g.zBaseURL)<br> |
| 243 | - @ g.zTop = %h(g.zTop)<hr> | |
| 243 | + @ g.zTop = %h(g.zTop)<br> | |
| 244 | + @ g.zExtra = %h(g.zExtra)<hr> | |
| 244 | 245 | cgi_print_all(); |
| 245 | 246 | style_footer(); |
| 246 | 247 | } |
| 247 | 248 |
| --- src/style.c | |
| +++ src/style.c | |
| @@ -238,9 +238,10 @@ | |
| 238 | ** WEBPAGE: test_env |
| 239 | */ |
| 240 | void page_test_env(void){ |
| 241 | style_header("Environment Test"); |
| 242 | @ g.zBaseURL = %h(g.zBaseURL)<br> |
| 243 | @ g.zTop = %h(g.zTop)<hr> |
| 244 | cgi_print_all(); |
| 245 | style_footer(); |
| 246 | } |
| 247 |
| --- src/style.c | |
| +++ src/style.c | |
| @@ -238,9 +238,10 @@ | |
| 238 | ** WEBPAGE: test_env |
| 239 | */ |
| 240 | void page_test_env(void){ |
| 241 | style_header("Environment Test"); |
| 242 | @ g.zBaseURL = %h(g.zBaseURL)<br> |
| 243 | @ g.zTop = %h(g.zTop)<br> |
| 244 | @ g.zExtra = %h(g.zExtra)<hr> |
| 245 | cgi_print_all(); |
| 246 | style_footer(); |
| 247 | } |
| 248 |