www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00
Code Activity

* Correctly merge SSLRenegBufferSize directive.

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


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@733465 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Ruediger Pluem
2009-01-11 12:58:08 +00:00
parent 85829152b9
commit 0f6f55ba57
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@@ -2,6 +2,9 @@
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]

2
modules/ssl/ssl_engine_config.c
View File

@@ -295,7 +295,7 @@ void *ssl_config_perdir_create(apr_pool_t *p, char *dir)
dc->szCACertificateFile = NULL;
dc->szUserName = NULL;
dc->nRenegBufferSize = DEFAULT_RENEG_BUFFER_SIZE;
dc->nRenegBufferSize = UNSET;
return dc;
}

7
modules/ssl/ssl_engine_kernel.c
View File

@@ -600,10 +600,13 @@ int ssl_hook_Access(request_rec *r)
&& 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. */