httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Eric Cholet" <cho...@logilune.com>
Subject Re: Again a symbol to add to httpd.exp for AIX and mod_perl 1.24
Date Fri, 16 Jun 2000 17:44:05 GMT
> > > The only time a module should care about the config-test-only
> > > condition is when it's dealing with its directives.  And those
> > > are passed a cmd_parms argument, so they'd have access to the
> > > flag without exporting a global.

How about this patch to 1.3 HEAD:

Index: src/include/ap_mmn.h
===================================================================
RCS file: /home/cvspublic/apache-1.3/src/include/ap_mmn.h,v
retrieving revision 1.46
diff -b -u -r1.46 ap_mmn.h
--- src/include/ap_mmn.h        2000/03/21 05:01:21     1.46
+++ src/include/ap_mmn.h        2000/06/16 16:16:25
@@ -228,6 +228,7 @@
  *                        ap_pbase64decode(), ap_pbase64encode()
  * 19990320.7           - add ap_strcasestr()
  * 19990320.8           - add request_rec.case_preserved_filename
+ * 19990320.9           - add configtestonly to cmd_parms
  */

 #define MODULE_MAGIC_COOKIE 0x41503133UL /* "AP13" */
@@ -235,7 +236,7 @@
 #ifndef MODULE_MAGIC_NUMBER_MAJOR
 #define MODULE_MAGIC_NUMBER_MAJOR 19990320
 #endif
-#define MODULE_MAGIC_NUMBER_MINOR 8                     /* 0...n */
+#define MODULE_MAGIC_NUMBER_MINOR 9                     /* 0...n */
 #define MODULE_MAGIC_NUMBER MODULE_MAGIC_NUMBER_MAJOR  /* backward compat
*/

 /* Useful for testing for features. */
Index: src/include/http_config.h
===================================================================
RCS file: /home/cvspublic/apache-1.3/src/include/http_config.h,v
retrieving revision 1.103
diff -b -u -r1.103 http_config.h
--- src/include/http_config.h   2000/06/01 23:42:23     1.103
+++ src/include/http_config.h   2000/06/16 16:16:26
@@ -172,6 +172,7 @@
     const char *end_token;     /* end token required to end a nested
section */
     void *context;             /* per_dir_config vector passed
                                 * to handle_command */
+    int configtestonly;         /* if using -t or -T command line option */
 } cmd_parms;

 /* This structure records the existence of handlers in a module... */
Index: src/main/http_config.c
===================================================================
RCS file: /home/cvspublic/apache-1.3/src/main/http_config.c,v
retrieving revision 1.153
diff -b -u -r1.153 http_config.c
--- src/main/http_config.c      2000/06/01 23:42:24     1.153
+++ src/main/http_config.c      2000/06/16 16:16:30
@@ -1169,6 +1169,7 @@
     parms.temp_pool = ptemp;
     parms.server = s;
     parms.override = (RSRC_CONF | OR_ALL) & ~(OR_AUTHCFG | OR_LIMIT);
+    parms.configtestonly = ap_configtestonly;
     parms.config_file = ap_pcfg_open_custom(p, "-c/-C directives",
                                          &arr_parms, NULL,
                                          arr_elts_getstr, arr_elts_close);
@@ -1215,6 +1216,7 @@
     parms.temp_pool = ptemp;
     parms.server = s;
     parms.override = (RSRC_CONF | OR_ALL) & ~(OR_AUTHCFG | OR_LIMIT);
+    parms.configtestonly = ap_configtestonly;

     if (!(parms.config_file = ap_pcfg_openfile(p,fname))) {
        perror("fopen");


--
Eric




Mime
View raw message