Fossil SCM
Make sure fossil_panic() text is given a proper header in CGI mode.
Commit
dbfe682b925d167012c928a943e5471f0ab43632
Parent
b4f9d90ca37ea1d…
1 file changed
+3
-2
+3
-2
| --- src/main.c | ||
| +++ src/main.c | ||
| @@ -236,15 +236,16 @@ | ||
| 236 | 236 | ** Print an error message, rollback all databases, and quit. |
| 237 | 237 | */ |
| 238 | 238 | void fossil_panic(const char *zFormat, ...){ |
| 239 | 239 | char *z; |
| 240 | 240 | va_list ap; |
| 241 | + static int once = 1; | |
| 241 | 242 | va_start(ap, zFormat); |
| 242 | 243 | z = vmprintf(zFormat, ap); |
| 243 | 244 | va_end(ap); |
| 244 | - if( g.cgiPanic ){ | |
| 245 | - g.cgiPanic = 0; | |
| 245 | + if( g.cgiPanic && once ){ | |
| 246 | + once = 0; | |
| 246 | 247 | cgi_printf("<p><font color=\"red\">%h</font></p>", z); |
| 247 | 248 | style_footer(); |
| 248 | 249 | cgi_reply(); |
| 249 | 250 | }else{ |
| 250 | 251 | fprintf(stderr, "%s: %s\n", g.argv[0], z); |
| 251 | 252 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -236,15 +236,16 @@ | |
| 236 | ** Print an error message, rollback all databases, and quit. |
| 237 | */ |
| 238 | void fossil_panic(const char *zFormat, ...){ |
| 239 | char *z; |
| 240 | va_list ap; |
| 241 | va_start(ap, zFormat); |
| 242 | z = vmprintf(zFormat, ap); |
| 243 | va_end(ap); |
| 244 | if( g.cgiPanic ){ |
| 245 | g.cgiPanic = 0; |
| 246 | cgi_printf("<p><font color=\"red\">%h</font></p>", z); |
| 247 | style_footer(); |
| 248 | cgi_reply(); |
| 249 | }else{ |
| 250 | fprintf(stderr, "%s: %s\n", g.argv[0], z); |
| 251 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -236,15 +236,16 @@ | |
| 236 | ** Print an error message, rollback all databases, and quit. |
| 237 | */ |
| 238 | void fossil_panic(const char *zFormat, ...){ |
| 239 | char *z; |
| 240 | va_list ap; |
| 241 | static int once = 1; |
| 242 | va_start(ap, zFormat); |
| 243 | z = vmprintf(zFormat, ap); |
| 244 | va_end(ap); |
| 245 | if( g.cgiPanic && once ){ |
| 246 | once = 0; |
| 247 | cgi_printf("<p><font color=\"red\">%h</font></p>", z); |
| 248 | style_footer(); |
| 249 | cgi_reply(); |
| 250 | }else{ |
| 251 | fprintf(stderr, "%s: %s\n", g.argv[0], z); |
| 252 |