httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From minf...@apache.org
Subject svn commit: r649109 - in /httpd/httpd/trunk/modules: aaa/mod_auth_form.c filters/mod_request.c filters/mod_request.h
Date Thu, 17 Apr 2008 13:59:57 GMT
Author: minfrin
Date: Thu Apr 17 06:59:51 2008
New Revision: 649109

URL: http://svn.apache.org/viewvc?rev=649109&view=rev
Log:
Fix the optional declarations so that the modules will build clean in
a mod_so environment.

Modified:
    httpd/httpd/trunk/modules/aaa/mod_auth_form.c
    httpd/httpd/trunk/modules/filters/mod_request.c
    httpd/httpd/trunk/modules/filters/mod_request.h

Modified: httpd/httpd/trunk/modules/aaa/mod_auth_form.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/mod_auth_form.c?rev=649109&r1=649108&r2=649109&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_auth_form.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_auth_form.c Thu Apr 17 06:59:51 2008
@@ -46,8 +46,8 @@
                                   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;

Modified: httpd/httpd/trunk/modules/filters/mod_request.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/mod_request.c?rev=649109&r1=649108&r2=649109&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/mod_request.c (original)
+++ httpd/httpd/trunk/modules/filters/mod_request.c Thu Apr 17 06:59:51 2008
@@ -574,6 +574,7 @@
         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 = {

Modified: httpd/httpd/trunk/modules/filters/mod_request.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/mod_request.h?rev=649109&r1=649108&r2=649109&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/mod_request.h (original)
+++ httpd/httpd/trunk/modules/filters/mod_request.h Thu Apr 17 06:59:51 2008
@@ -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 @@
 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
 }



Mime
View raw message