ben 99/07/11 09:42:25
Modified: mpm/src/include ap_hooks.h mpm/src/main http_config.c http_connection.c http_protocol.c http_request.c Log: Make run_all symbolic. Revision Changes Path 1.6 +3 -0 apache-2.0/mpm/src/include/ap_hooks.h Index: ap_hooks.h =================================================================== RCS file: /export/home/cvs/apache-2.0/mpm/src/include/ap_hooks.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ap_hooks.h 1999/07/11 13:27:24 1.5 +++ ap_hooks.h 1999/07/11 16:42:23 1.6 @@ -56,6 +56,9 @@ return rv_final; \ } +#define RUN_ALL 1 +#define RUN_TO_FIRST_ERROR 0 + #define IMPLEMENT_HOOK(ret,name,args,args2,run_all,ok,decline) \ IMPLEMENT_HOOK_BASE(ret,ret r_;,r_=,r_,name,args,args2,run_all,r_ != decline,r_ != ok,run_all ? ok : decline) #define IMPLEMENT_VOID_HOOK(name,args,args2,run_all) \ 1.9 +1 -1 apache-2.0/mpm/src/main/http_config.c Index: http_config.c =================================================================== RCS file: /export/home/cvs/apache-2.0/mpm/src/main/http_config.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- http_config.c 1999/07/11 13:27:25 1.8 +++ http_config.c 1999/07/11 16:42:23 1.9 @@ -389,7 +389,7 @@ return run_method(r, offsets_into_method_ptrs.logger, 1); } -IMPLEMENT_HOOK(int,header_parser,(request_rec *r),(r),1,OK,DECLINED) +IMPLEMENT_HOOK(int,header_parser,(request_rec *r),(r),RUN_ALL,OK,DECLINED) /* Auth stuff --- anything that defines one of these will presumably * want to define something for the other. Note that check_auth is 1.10 +1 -1 apache-2.0/mpm/src/main/http_connection.c Index: http_connection.c =================================================================== RCS file: /export/home/cvs/apache-2.0/mpm/src/main/http_connection.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- http_connection.c 1999/07/07 15:31:58 1.9 +++ http_connection.c 1999/07/11 16:42:24 1.10 @@ -68,7 +68,7 @@ HOOK_LINK(pre_connection) ); -IMPLEMENT_VOID_HOOK(pre_connection,(conn_rec *c),(c),1) +IMPLEMENT_VOID_HOOK(pre_connection,(conn_rec *c),(c),RUN_ALL) /* TODO: re-implement the lingering close stuff */ #define NO_LINGCLOSE 1.11 +1 -1 apache-2.0/mpm/src/main/http_protocol.c Index: http_protocol.c =================================================================== RCS file: /export/home/cvs/apache-2.0/mpm/src/main/http_protocol.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- http_protocol.c 1999/07/11 14:49:04 1.10 +++ http_protocol.c 1999/07/11 16:42:24 1.11 @@ -2688,4 +2688,4 @@ ap_finalize_request_protocol(r); } -IMPLEMENT_HOOK(int,post_read_request,(request_rec *r),(r),1,OK,DECLINED) +IMPLEMENT_HOOK(int,post_read_request,(request_rec *r),(r),RUN_ALL,OK,DECLINED) 1.9 +2 -1 apache-2.0/mpm/src/main/http_request.c Index: http_request.c =================================================================== RCS file: /export/home/cvs/apache-2.0/mpm/src/main/http_request.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- http_request.c 1999/07/11 13:27:25 1.8 +++ http_request.c 1999/07/11 16:42:24 1.9 @@ -82,7 +82,8 @@ HOOK_LINK(translate_name) ) -IMPLEMENT_HOOK(int,translate_name,(request_rec *r),(r),0,OK,DECLINED) +IMPLEMENT_HOOK(int,translate_name,(request_rec *r),(r),RUN_TO_FIRST_ERROR,OK, + DECLINED) /***************************************************************** *