Fix the optional declarations so that the modules will build clean in

a mod_so environment.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@649109 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/aaa/mod_auth_form.c b/modules/aaa/mod_auth_form.c
index 33fad92d59c3427f7ef5e1a111bfcc77e1c3595f..8550dd8f96f5c4601d876c80c8080554727f3b2f 100644 (file)
--- a/modules/aaa/mod_auth_form.c
+++ b/modules/aaa/mod_auth_form.c
@@ -46,8 +46,8 @@ static void (*ap_session_get_fn) (request_rec * r, session_rec * z,
                                   const char *key, const char **value) = NULL;
 static void (*ap_session_set_fn) (request_rec * r, session_rec * z,
                                   const char *key, const char *value) = NULL;
-static void (*ap_parse_request_form_fn) (request_rec * r, apr_array_header_t ** ptr,
-                                         apr_size_t num, apr_size_t size) = NULL;
+static int (*ap_parse_request_form_fn) (request_rec * r, apr_array_header_t ** ptr,
+                                        apr_size_t num, apr_size_t size) = NULL;
 
 typedef struct {
     authn_provider_list *providers;

diff --git a/modules/filters/mod_request.c b/modules/filters/mod_request.c
index c3026dc563e9468351d19b3b20ca761c2b656c17..8c2869b618ec9708b881fb1be1fed4e5b6d34c98 100644 (file)
--- a/modules/filters/mod_request.c
+++ b/modules/filters/mod_request.c
@@ -574,6 +574,7 @@ static void register_hooks(apr_pool_t *p)
         ap_register_input_filter(KEPT_BODY_FILTER, ap_kept_body_filter,
                                  kept_body_filter_init, AP_FTYPE_RESOURCE);
     ap_hook_fixups(request_fixups, NULL, NULL, APR_HOOK_MIDDLE);
+    APR_REGISTER_OPTIONAL_FN(ap_parse_request_form);
 }
 
 module AP_MODULE_DECLARE_DATA request_module = {

diff --git a/modules/filters/mod_request.h b/modules/filters/mod_request.h
index 91ee8db9a302979ceec290a75348ccd2d9ce68a7..53afdfb1e2b98a92b3a0c2c6b7d78b902475e4a5 100644 (file)
--- a/modules/filters/mod_request.h
+++ b/modules/filters/mod_request.h
@@ -29,6 +29,7 @@
 
 #include "apr.h"
 #include "apr_buckets.h"
+#include "apr_optional.h"
 
 #include "httpd.h"
 #include "util_filter.h"
@@ -113,8 +114,8 @@ typedef struct {
 AP_DECLARE(int) ap_parse_request_form(request_rec * r, apr_array_header_t ** ptr,
                                       apr_size_t num, apr_size_t size);
 
-APR_DECLARE_OPTIONAL_FN(void, ap_parse_request_form, (request_rec * r, apr_array_header_t ** ptr,
-                                                      apr_size_t num, apr_size_t size));
+APR_DECLARE_OPTIONAL_FN(int, ap_parse_request_form, (request_rec * r, apr_array_header_t ** ptr,
+                                                     apr_size_t num, apr_size_t size));
 
 #ifdef __cplusplus
 }