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

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1530038 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/STATUS b/STATUS
index dd5dd14dbabe24363cc4f936fe3cc43827ea2ff6..bffc15985febcde22b2857800838d977cc76060d 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -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

diff --git a/include/http_protocol.h b/include/http_protocol.h
index 415270b2ad2accd08760f3272faa50ad219756e1..cdf8f589fda16e4812a6855e798c1a738b4be980 100644 (file)
--- a/include/http_protocol.h
+++ b/include/http_protocol.h
@@ -411,7 +411,7 @@ AP_DECLARE(int) ap_rwrite(const void *buf, int nbyte, request_rec *r);
  */
 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);
 }
 
 /**