From: Jim Jagielski <jim@apache.org>
Date: Mon, 11 Nov 2013 14:05:50 +0000 (+0000)
Subject: r954641: Fix some compiler warnings:
X-Git-Tag: 2.2.26~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=90193380c70eceda8e128ac065207c4ab69fbbd8;p=thirdparty%2Fapache%2Fhttpd.git

r954641: Fix some compiler warnings:


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

diff --git a/STATUS b/STATUS
index fc10f7c989d..7274b76a7a1 100644
--- a/STATUS
+++ b/STATUS
@@ -97,13 +97,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
   
-  * mod_ssl config: Fix range check bug with SSLRenegBufferSize
-    trunk patch: http://svn.apache.org/r954641
-                 (only this part, which has the only non-style fix applicable to 2.2.x:
-                 http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_engine_config.c?r1=954641&r2=954640&pathrev=954641&view=patch)
-    2.4.x patch: it was fixed before 2.4.x was branched
-    2.2.x patch: trunk patch to ssl_engine_config.c (above) applies with offset
-    +1: trawick, jorton, wrowe
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
diff --git a/modules/ssl/ssl_engine_config.c b/modules/ssl/ssl_engine_config.c
index 20e199c354b..1c9953ff576 100644
--- a/modules/ssl/ssl_engine_config.c
+++ b/modules/ssl/ssl_engine_config.c
@@ -1272,12 +1272,14 @@ const char *ssl_cmd_SSLRequire(cmd_parms *cmd,
 const char *ssl_cmd_SSLRenegBufferSize(cmd_parms *cmd, void *dcfg, const char *arg)
 {
     SSLDirConfigRec *dc = dcfg;
-    
-    dc->nRenegBufferSize = atoi(arg);
-    if (dc->nRenegBufferSize < 0) {
+    int val;
+
+    val = atoi(arg);
+    if (val < 0) {
         return apr_pstrcat(cmd->pool, "Invalid size for SSLRenegBufferSize: ",
                            arg, NULL);
     }
+    dc->nRenegBufferSize = val;
 
     return NULL;
 }