httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "William A. Rowe, Jr." <wr...@rowe-clan.net>
Subject [patch] Minor bump required?
Date Mon, 25 Sep 2000 20:28:15 GMT

This patch resolves an existing problem with ap_check_cmd_context.
Although it is useful to any module with specific interests (such
as the new mod_isapi directives I'm adding) - it was declared
as CORE_PRIVATE.

This is pretty inappropriate, I'd like to move it out of that test.
Since the name space changes, should we bump the mmn minor?

Bill


Index: src/include/http_config.h
===================================================================
RCS file: /home/cvs/apache-1.3/src/include/http_config.h,v
retrieving revision 1.103
diff -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/09/25 20:26:15
@@ -335,6 +335,18 @@
 /* for implementing subconfigs and customized config files */
 API_EXPORT(const char *) ap_srm_command_loop(cmd_parms *parms, void *config);
 
+/* ap_check_cmd_context() definitions: */
+API_EXPORT(const char *) ap_check_cmd_context(cmd_parms *cmd, unsigned forbidden);
+
+/* ap_check_cmd_context():              Forbidden in: */
+#define  NOT_IN_VIRTUALHOST     0x01 /* <Virtualhost> */
+#define  NOT_IN_LIMIT           0x02 /* <Limit> */
+#define  NOT_IN_DIRECTORY       0x04 /* <Directory> */
+#define  NOT_IN_LOCATION        0x08 /* <Location> */
+#define  NOT_IN_FILES           0x10 /* <Files> */
+#define  NOT_IN_DIR_LOC_FILE    (NOT_IN_DIRECTORY|NOT_IN_LOCATION|NOT_IN_FILES) /* <Directory>/<Location>/<Files>*/
+#define  GLOBAL_ONLY            (NOT_IN_VIRTUALHOST|NOT_IN_LIMIT|NOT_IN_DIR_LOC_FILE)
+
 #ifdef CORE_PRIVATE
 
 extern API_VAR_EXPORT module *top_module;
@@ -373,19 +385,6 @@
 				server_rec *main_server, server_rec **);
 void ap_process_resource_config(server_rec *s, char *fname, pool *p, pool *ptemp);
 
-/* ap_check_cmd_context() definitions: */
-API_EXPORT(const char *) ap_check_cmd_context(cmd_parms *cmd, unsigned forbidden);
-
-/* ap_check_cmd_context():              Forbidden in: */
-#define  NOT_IN_VIRTUALHOST     0x01 /* <Virtualhost> */
-#define  NOT_IN_LIMIT           0x02 /* <Limit> */
-#define  NOT_IN_DIRECTORY       0x04 /* <Directory> */
-#define  NOT_IN_LOCATION        0x08 /* <Location> */
-#define  NOT_IN_FILES           0x10 /* <Files> */
-#define  NOT_IN_DIR_LOC_FILE    (NOT_IN_DIRECTORY|NOT_IN_LOCATION|NOT_IN_FILES) /* <Directory>/<Location>/<Files>*/
-#define  GLOBAL_ONLY            (NOT_IN_VIRTUALHOST|NOT_IN_LIMIT|NOT_IN_DIR_LOC_FILE)
-
-
 /* Module-method dispatchers, also for http_request.c */
 
 int ap_translate_name(request_rec *);
@@ -406,7 +405,7 @@
 CORE_EXPORT(void *) ap_set_config_vectors(cmd_parms *parms, void *config, module *mod);
 CORE_EXPORT(const char *) ap_handle_command(cmd_parms *parms, void *config, const char *l);
 
-#endif
+#endif /* def CORE_PRIVATE */
 
 #ifdef __cplusplus
 }


Mime
View raw message