]> granicus.if.org Git - apache/commitdiff
Fix compile time warnings.
authorGarrett Rooney <rooneg@apache.org>
Fri, 28 Apr 2006 17:50:56 +0000 (17:50 +0000)
committerGarrett Rooney <rooneg@apache.org>
Fri, 28 Apr 2006 17:50:56 +0000 (17:50 +0000)
Pointed out by: jorton

* modules/proxy/mod_proxy_fcgi.c
  Add include of util_script.h to pick up some function prototypes.
  (send_begin_request): Initialize the reserved bytes in the request
   body to zero.
  (dispatch): Use APR_SIZE_T_FMT instead of %d when logging an apr_size_t.

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

modules/proxy/mod_proxy_fcgi.c

index 51fb90533a34947442d38f09b030591d113c512d..1d014632de9109ed1144e1cd3b3e5e0b0678db53 100644 (file)
@@ -16,6 +16,7 @@
 
 #include "mod_proxy.h"
 #include "fcgi_protocol.h"
+#include "util_script.h"
 
 module AP_MODULE_DECLARE_DATA proxy_fcgi_module;
 
@@ -240,6 +241,11 @@ static apr_status_t send_begin_request(proxy_conn_rec *conn, int request_id)
     brb.roleB1 = ((FCGI_RESPONDER >> 8) & 0xff);
     brb.roleB0 = ((FCGI_RESPONDER) & 0xff); 
     brb.flags = FCGI_KEEP_CONN;
+    brb.reserved[0] = 0;
+    brb.reserved[1] = 0;
+    brb.reserved[2] = 0;
+    brb.reserved[3] = 0;
+    brb.reserved[4] = 0;
 
     fcgi_header_to_array(&header, farray);
     fcgi_begin_request_body_to_array(&brb, abrb);
@@ -673,7 +679,7 @@ static apr_status_t dispatch(proxy_conn_rec *conn, request_rec *r,
             if (readbuflen != FCGI_HEADER_LEN) {
                 ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
                              "proxy: FCGI: Failed to read entire header "
-                             "got %d wanted %d", 
+                             "got %" APR_SIZE_T_FMT " wanted %d", 
                              readbuflen, FCGI_HEADER_LEN);
                 rv = APR_EINVAL;
                 break;