Fossil SCM

Only invoke the email alert sender after a successful HTTP request. Mark Not Found requests as 404, unsuccessful.

drh 2018-06-24 18:22 trunk
Commit 4eb3e0f20e04edc563d903065486c85a56d883e323c6a1e15503e21ff85c9969
2 files changed +3 -1 +2
+3 -1
--- src/cgi.c
+++ src/cgi.c
@@ -340,11 +340,13 @@
340340
CGIDEBUG(("DONE\n"));
341341
342342
/* After the webpage has been sent, do any useful background
343343
/* processing.
344344
*/
345
- email_auto_exec();
345
+ if( iReplyStatus==200 ){
346
+ email_auto_exec();
347
+ }
346348
}
347349
348350
/*
349351
** Do a redirect request to the URL given in the argument.
350352
**
351353
--- src/cgi.c
+++ src/cgi.c
@@ -340,11 +340,13 @@
340 CGIDEBUG(("DONE\n"));
341
342 /* After the webpage has been sent, do any useful background
343 /* processing.
344 */
345 email_auto_exec();
 
 
346 }
347
348 /*
349 ** Do a redirect request to the URL given in the argument.
350 **
351
--- src/cgi.c
+++ src/cgi.c
@@ -340,11 +340,13 @@
340 CGIDEBUG(("DONE\n"));
341
342 /* After the webpage has been sent, do any useful background
343 /* processing.
344 */
345 if( iReplyStatus==200 ){
346 email_auto_exec();
347 }
348 }
349
350 /*
351 ** Do a redirect request to the URL given in the argument.
352 **
353
+2
--- src/name.c
+++ src/name.c
@@ -423,12 +423,14 @@
423423
int rid;
424424
425425
if( zName==0 || zName[0]==0 ) return 0;
426426
rid = symbolic_name_to_rid(zName, zType);
427427
if( rid<0 ){
428
+ cgi_set_status(404, "Not Found");
428429
fossil_fatal("ambiguous name: %s", zName);
429430
}else if( rid==0 ){
431
+ cgi_set_status(404, "Not Found");
430432
fossil_fatal("not found: %s", zName);
431433
}
432434
return rid;
433435
}
434436
int name_to_rid(const char *zName){
435437
--- src/name.c
+++ src/name.c
@@ -423,12 +423,14 @@
423 int rid;
424
425 if( zName==0 || zName[0]==0 ) return 0;
426 rid = symbolic_name_to_rid(zName, zType);
427 if( rid<0 ){
 
428 fossil_fatal("ambiguous name: %s", zName);
429 }else if( rid==0 ){
 
430 fossil_fatal("not found: %s", zName);
431 }
432 return rid;
433 }
434 int name_to_rid(const char *zName){
435
--- src/name.c
+++ src/name.c
@@ -423,12 +423,14 @@
423 int rid;
424
425 if( zName==0 || zName[0]==0 ) return 0;
426 rid = symbolic_name_to_rid(zName, zType);
427 if( rid<0 ){
428 cgi_set_status(404, "Not Found");
429 fossil_fatal("ambiguous name: %s", zName);
430 }else if( rid==0 ){
431 cgi_set_status(404, "Not Found");
432 fossil_fatal("not found: %s", zName);
433 }
434 return rid;
435 }
436 int name_to_rid(const char *zName){
437

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button