httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rpl...@apache.org
Subject svn commit: r733465 - in /httpd/httpd/trunk: CHANGES modules/ssl/ssl_engine_config.c modules/ssl/ssl_engine_kernel.c
Date Sun, 11 Jan 2009 12:58:08 GMT
Author: rpluem
Date: Sun Jan 11 04:58:08 2009
New Revision: 733465

URL: http://svn.apache.org/viewvc?rev=733465&view=rev
Log:
* Correctly merge SSLRenegBufferSize directive.

PR: 46508
Submitted by: <tlhackque yahoo.com>
Reviewed by: rpluem

Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/modules/ssl/ssl_engine_config.c
    httpd/httpd/trunk/modules/ssl/ssl_engine_kernel.c

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=733465&r1=733464&r2=733465&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Sun Jan 11 04:58:08 2009
@@ -2,13 +2,16 @@
 Changes with Apache 2.3.2
 [ When backported to 2.2.x, remove entry from this file ]
 
+ *) mod_ssl: Fix merging of SSLRenegBufferSize directive. PR 46508
+    [<tlhackque yahoo.com>]
+
  *) core: Translate the the status line to ASCII on EBCDIC platforms in
     ap_send_interim_response() and for locally generated "100 Continue"
     responses.  [Eric Covener]
 
  *) mod_authnz_ldap: Reduce number of initialization debug messages and make
     information more clear. PR 46342 [Dan Poirier]
- 
+
  *) prefork: Fix child process hang during graceful restart/stop in
     configurations with multiple listening sockets.  PR 42829.  [Joe Orton,
     Jeff Trawick]

Modified: httpd/httpd/trunk/modules/ssl/ssl_engine_config.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_engine_config.c?rev=733465&r1=733464&r2=733465&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_engine_config.c (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_engine_config.c Sun Jan 11 04:58:08 2009
@@ -295,7 +295,7 @@
     dc->szCACertificateFile    = NULL;
     dc->szUserName             = NULL;
 
-    dc->nRenegBufferSize = DEFAULT_RENEG_BUFFER_SIZE;
+    dc->nRenegBufferSize = UNSET;
 
     return dc;
 }

Modified: httpd/httpd/trunk/modules/ssl/ssl_engine_kernel.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_engine_kernel.c?rev=733465&r1=733464&r2=733465&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_engine_kernel.c (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_engine_kernel.c Sun Jan 11 04:58:08 2009
@@ -600,10 +600,13 @@
                 && strcmp(apr_table_get(r->headers_in, "content-length"), "0")))
         && !r->expecting_100) {
         int rv;
+        apr_size_t rsize;
 
-        if (dc->nRenegBufferSize > 0) {
+        rsize = dc->nRenegBufferSize == UNSET ? DEFAULT_RENEG_BUFFER_SIZE :
+                                                dc->nRenegBufferSize;
+        if (rsize > 0) {
             /* Fill the I/O buffer with the request body if possible. */
-            rv = ssl_io_buffer_fill(r, dc->nRenegBufferSize);
+            rv = ssl_io_buffer_fill(r, rsize);
         }
         else {
             /* If the reneg buffer size is set to zero, just fail. */



Mime
View raw message