httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gsm...@apache.org
Subject svn commit: r1530038 - in /httpd/httpd/branches/2.4.x: ./ STATUS include/http_protocol.h
Date Mon, 07 Oct 2013 19:41:19 GMT
Author: gsmith
Date: Mon Oct  7 19:41:19 2013
New Revision: 1530038

URL: http://svn.apache.org/r1530038
Log:
Merge r1529449 from trunk:

  * core: Axe MSVC warning for http_protocol.c (issued about 128 times
          with a 2.4.x build)

Submitted By: trawick
Reviewed By: covener, gsmith


Modified:
    httpd/httpd/branches/2.4.x/   (props changed)
    httpd/httpd/branches/2.4.x/STATUS
    httpd/httpd/branches/2.4.x/include/http_protocol.h

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk:r1529449

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1530038&r1=1530037&r2=1530038&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Mon Oct  7 19:41:19 2013
@@ -97,12 +97,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  * core: Axe MSVC warning for http_protocol.c (issued about 128 times
-          with a 2.4.x build)
-    trunk patch: https://svn.apache.org/r1529449
-    2.4.x: trunk patch works
-    +1: trawick, covener, gsmith
-
   * WinNT MPM: Follow MS docs on AcceptEx/GetAcceptExSockaddrs
     trunk patch: https://svn.apache.org/r1363312
     2.4.x: trunk patch works

Modified: httpd/httpd/branches/2.4.x/include/http_protocol.h
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/include/http_protocol.h?rev=1530038&r1=1530037&r2=1530038&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/include/http_protocol.h (original)
+++ httpd/httpd/branches/2.4.x/include/http_protocol.h Mon Oct  7 19:41:19 2013
@@ -411,7 +411,7 @@ AP_DECLARE(int) ap_rwrite(const void *bu
  */
 static APR_INLINE int ap_rputs(const char *str, request_rec *r)
 {
-    return ap_rwrite(str, strlen(str), r);
+    return ap_rwrite(str, (int)strlen(str), r);
 }
 
 /**



Mime
View raw message