httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject svn commit: r917726 - /httpd/httpd/branches/2.2.x/modules/ssl/ssl_engine_io.c
Date Mon, 01 Mar 2010 21:27:18 GMT
Author: jorton
Date: Mon Mar  1 21:27:17 2010
New Revision: 917726

URL: http://svn.apache.org/viewvc?rev=917726&view=rev
Log:
* modules/ssl/ssl_engine_io.c: Restore code removed by
mistake in mis-merged r917343.

Reviewed by: jorton, trawick, wrowe

Modified:
    httpd/httpd/branches/2.2.x/modules/ssl/ssl_engine_io.c

Modified: httpd/httpd/branches/2.2.x/modules/ssl/ssl_engine_io.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/ssl/ssl_engine_io.c?rev=917726&r1=917725&r2=917726&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/ssl/ssl_engine_io.c (original)
+++ httpd/httpd/branches/2.2.x/modules/ssl/ssl_engine_io.c Mon Mar  1 21:27:17 2010
@@ -472,6 +472,12 @@
     if (!in)
         return 0;
 
+    /* Abort early if the client has initiated a renegotiation. */
+    if (inctx->filter_ctx->config->reneg_state == RENEG_ABORT) {
+        inctx->rc = APR_ECONNABORTED;
+        return -1;
+    }
+
     /* In theory, OpenSSL should flush as necessary, but it is known
      * not to do so correctly in some cases; see PR 46952.
      *



Mime
View raw message