Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1523259 - in /httpd/httpd/branches/2.4.x: ./ include/
 modules/cache/ modules/filters/ modules/generators/ modules/lua/
 modules/proxy/
Date: Sat, 14 Sep 2013 14:44:24 -0000
To: cvs@httpd.apache.org
From: minfrin@apache.org
Message-Id: <20130914144424.C9FCA238899C@eris.apache.org>

Author: minfrin
Date: Sat Sep 14 14:44:23 2013
New Revision: 1523259

URL: http://svn.apache.org/r1523259
Log:
modules: Fix some compiler warnings.

trunk patch: http://svn.apache.org/r1500345
             http://svn.apache.org/r1500362
             http://svn.apache.org/r1500423
             http://svn.apache.org/r1500483
             http://svn.apache.org/r1500519

Submitted by: fuankg
Reviewed by: jim, minfrin

Modified:
    httpd/httpd/branches/2.4.x/   (props changed)
    httpd/httpd/branches/2.4.x/CHANGES
    httpd/httpd/branches/2.4.x/STATUS
    httpd/httpd/branches/2.4.x/include/util_ldap.h
    httpd/httpd/branches/2.4.x/modules/cache/mod_socache_memcache.c
    httpd/httpd/branches/2.4.x/modules/filters/mod_charset_lite.c
    httpd/httpd/branches/2.4.x/modules/filters/mod_data.c
    httpd/httpd/branches/2.4.x/modules/generators/mod_info.c
    httpd/httpd/branches/2.4.x/modules/lua/lua_request.c
    httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_connect.c
    httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_fcgi.c

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk:r1500345,1500362,1500423,1500483,1500519

Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1523259&r1=1523258&r2=1523259&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Sat Sep 14 14:44:23 2013
@@ -2,6 +2,8 @@
 
 Changes with Apache 2.4.7
 
+  *) modules: Fix some compiler warnings. [Guenter Knauf]
+
   * skiplist: Add skiplist capability to httpd [Jim Jagielski]
 
   * Sync 2.4 and trunk

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1523259&r1=1523258&r2=1523259&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Sat Sep 14 14:44:23 2013
@@ -164,21 +164,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
     2.4.x patch: trunk patch works
     +1: trawick, covener, humbedooh
 
-  * modules: Fix some compiler warnings.
-    trunk patch: http://svn.apache.org/r1500345
-                 http://svn.apache.org/r1500362
-                 http://svn.apache.org/r1500423
-                 http://svn.apache.org/r1500483
-                 http://svn.apache.org/r1500519
-    2.4.x patch: trunk patches work
-    +1: fuankg, jim, minfrin
-    comments:
-         jim: In general, casts are sometimes used to "hide" problems
-              that exist, esp when using the incorrect data types...
-              Are these casts safe?
-      fuankg: replied to list with further details about patches.
-      humbedooh: in r1500362, the lua changes can just be backported now :)
-
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]

Modified: httpd/httpd/branches/2.4.x/include/util_ldap.h
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/include/util_ldap.h?rev=1523259&r1=1523258&r2=1523259&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/include/util_ldap.h (original)
+++ httpd/httpd/branches/2.4.x/include/util_ldap.h Sat Sep 14 14:44:23 2013
@@ -83,6 +83,10 @@
 #define LDAP_DECLARE_DATA             __declspec(dllimport)
 #endif
 
+#ifdef WIN32
+#define timeval l_timeval
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif

Modified: httpd/httpd/branches/2.4.x/modules/cache/mod_socache_memcache.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/cache/mod_socache_memcache.c?rev=1523259&r1=1523258&r2=1523259&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/cache/mod_socache_memcache.c (original)
+++ httpd/httpd/branches/2.4.x/modules/cache/mod_socache_memcache.c Sat Sep 14 14:44:23 2013
@@ -85,7 +85,7 @@ static apr_status_t socache_mc_init(ap_s
 {
     apr_status_t rv;
     int thread_limit = 0;
-    int nservers = 0;
+    apr_uint16_t nservers = 0;
     char *cache_config;
     char *split;
     char *tok;

Modified: httpd/httpd/branches/2.4.x/modules/filters/mod_charset_lite.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/filters/mod_charset_lite.c?rev=1523259&r1=1523258&r2=1523259&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/filters/mod_charset_lite.c (original)
+++ httpd/httpd/branches/2.4.x/modules/filters/mod_charset_lite.c Sat Sep 14 14:44:23 2013
@@ -474,7 +474,7 @@ static void log_xlate_error(ap_filter_t 
     charset_filter_ctx_t *ctx = f->ctx;
     const char *msg;
     char msgbuf[100];
-    int len;
+    apr_size_t len;
 
     switch(ctx->ees) {
     case EES_LIMIT:

Modified: httpd/httpd/branches/2.4.x/modules/filters/mod_data.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/filters/mod_data.c?rev=1523259&r1=1523258&r2=1523259&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/filters/mod_data.c (original)
+++ httpd/httpd/branches/2.4.x/modules/filters/mod_data.c Sat Sep 14 14:44:23 2013
@@ -109,7 +109,8 @@ static apr_status_t data_out_filter(ap_f
             apr_brigade_length(ctx->bb, 1, &len);
             clen = apr_atoi64(content_length);
             if (clen >= 0 && clen < APR_INT32_MAX) {
-                ap_set_content_length(r, len + apr_base64_encode_len(clen) - 1);
+                ap_set_content_length(r, len +
+                                      apr_base64_encode_len((int)clen) - 1);
             }
             else {
                 apr_table_unset(r->headers_out, "Content-Length");

Modified: httpd/httpd/branches/2.4.x/modules/generators/mod_info.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/generators/mod_info.c?rev=1523259&r1=1523258&r2=1523259&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/generators/mod_info.c (original)
+++ httpd/httpd/branches/2.4.x/modules/generators/mod_info.c Sat Sep 14 14:44:23 2013
@@ -113,7 +113,7 @@ static void put_int_flush_right(request_
         if (r)
             ap_rputc('0' + i % 10, r);
         else
-            apr_file_putc('0' + i % 10, out);
+            apr_file_putc((char)('0' + i % 10), out);
     }
     else {
         if (r)

Modified: httpd/httpd/branches/2.4.x/modules/lua/lua_request.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/lua/lua_request.c?rev=1523259&r1=1523258&r2=1523259&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/lua/lua_request.c (original)
+++ httpd/httpd/branches/2.4.x/modules/lua/lua_request.c Sat Sep 14 14:44:23 2013
@@ -884,7 +884,7 @@ static int lua_apr_touch(lua_State *L)
     r = ap_lua_check_request_rec(L, 1);
     luaL_checktype(L, 2, LUA_TSTRING);
     path = lua_tostring(L, 2);
-    mtime = luaL_optnumber(L, 3, apr_time_now());
+    mtime = (apr_time_t)luaL_optnumber(L, 3, (lua_Number)apr_time_now());
     status = apr_file_mtime_set(path, mtime, r->pool);
     lua_pushboolean(L, (status == 0));
     return 1;

Modified: httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_connect.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_connect.c?rev=1523259&r1=1523258&r2=1523259&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_connect.c (original)
+++ httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_connect.c Sat Sep 14 14:44:23 2013
@@ -220,7 +220,7 @@ static int proxy_connect_handler(request
 
     apr_uri_t uri;
     const char *connectname;
-    int connectport = 0;
+    apr_port_t connectport = 0;
 
     /* is this for us? */
     if (r->method_number != M_CONNECT) {

Modified: httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_fcgi.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_fcgi.c?rev=1523259&r1=1523258&r2=1523259&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_fcgi.c (original)
+++ httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_fcgi.c Sat Sep 14 14:44:23 2013
@@ -234,7 +234,8 @@ static apr_status_t get_data(proxy_conn_
     return rv;
 }
 
-static apr_status_t send_begin_request(proxy_conn_rec *conn, int request_id)
+static apr_status_t send_begin_request(proxy_conn_rec *conn,
+                                       apr_uint16_t request_id)
 {
     struct iovec vec[2];
     fcgi_header header;
@@ -266,7 +267,7 @@ static apr_status_t send_begin_request(p
 }
 
 static apr_status_t send_environment(proxy_conn_rec *conn, request_rec *r,
-                                     int request_id)
+                                     apr_uint16_t request_id)
 {
     const apr_array_header_t *envarr;
     const apr_table_entry_t *elts;
@@ -390,7 +391,7 @@ static apr_status_t send_environment(pro
         itr += vallen;
     }
 
-    fill_in_header(&header, FCGI_PARAMS, request_id, bodylen, 0);
+    fill_in_header(&header, FCGI_PARAMS, request_id, (apr_uint16_t)bodylen, 0);
     fcgi_header_to_array(&header, farray);
 
     vec[0].iov_base = (void *)farray;
@@ -543,7 +544,7 @@ static void dump_header_to_log(request_r
 }
 
 static apr_status_t dispatch(proxy_conn_rec *conn, proxy_dir_conf *conf,
-                             request_rec *r, int request_id)
+                             request_rec *r, apr_uint16_t request_id)
 {
     apr_bucket_brigade *ib, *ob;
     int seen_end_of_headers = 0, done = 0;
@@ -884,7 +885,7 @@ static int fcgi_do_request(apr_pool_t *p
      * multiple requests to the same FastCGI connection, but
      * we don't support that, and always use a value of '1' to
      * keep things simple. */
-    int request_id = 1;
+    apr_uint16_t request_id = 1;
     apr_status_t rv;
 
     /* Step 1: Send FCGI_BEGIN_REQUEST */