httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r1540734 - in /httpd/httpd/branches/2.2.x: STATUS modules/ssl/ssl_engine_config.c
Date Mon, 11 Nov 2013 14:05:50 GMT
Author: jim
Date: Mon Nov 11 14:05:50 2013
New Revision: 1540734

URL: http://svn.apache.org/r1540734
Log:
r954641: Fix some compiler warnings:

Modified:
    httpd/httpd/branches/2.2.x/STATUS
    httpd/httpd/branches/2.2.x/modules/ssl/ssl_engine_config.c

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=1540734&r1=1540733&r2=1540734&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Mon Nov 11 14:05:50 2013
@@ -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:

Modified: httpd/httpd/branches/2.2.x/modules/ssl/ssl_engine_config.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/ssl/ssl_engine_config.c?rev=1540734&r1=1540733&r2=1540734&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/ssl/ssl_engine_config.c (original)
+++ httpd/httpd/branches/2.2.x/modules/ssl/ssl_engine_config.c Mon Nov 11 14:05:50 2013
@@ -1272,12 +1272,14 @@ const char *ssl_cmd_SSLRequire(cmd_parms
 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;
 }



Mime
View raw message