From: Gregg Lewis Smith <gsmith@apache.org>
Date: Mon, 7 Oct 2013 19:41:19 +0000 (+0000)
Subject: Merge r1529449 from trunk:
X-Git-Tag: 2.4.7~133
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=72310d56005ad3cd689efb1a40e8d9e1d66c0517;p=apache

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 dd5dd14dba..bffc15985f 100644
--- 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 415270b2ad..cdf8f589fd 100644
--- 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);
 }
 
 /**