diff options
| author | Clement Laforet <clement@FreeBSD.org> | 2004-03-08 12:51:54 +0000 |
|---|---|---|
| committer | Clement Laforet <clement@FreeBSD.org> | 2004-03-08 12:51:54 +0000 |
| commit | 87d90c973a2c5f075a1008a649f9db2a55084bff (patch) | |
| tree | 584e74fed0cd6c00099e0075f1cf9ea0d07a255d | |
| parent | 1ba15b7a7e9db75abf34f35fed7e9b8b0b4de58f (diff) | |
| download | ports-87d90c973a2c5f075a1008a649f9db2a55084bff.tar.gz ports-87d90c973a2c5f075a1008a649f9db2a55084bff.zip | |
Notes
| -rw-r--r-- | www/apache2/Makefile | 2 | ||||
| -rw-r--r-- | www/apache2/files/patch-modules:ssl:ssl_engine_io.c | 31 | ||||
| -rw-r--r-- | www/apache20/Makefile | 2 | ||||
| -rw-r--r-- | www/apache20/files/patch-modules:ssl:ssl_engine_io.c | 31 |
4 files changed, 64 insertions, 2 deletions
diff --git a/www/apache2/Makefile b/www/apache2/Makefile index bb74ee1b55bb..bdb9a9a40185 100644 --- a/www/apache2/Makefile +++ b/www/apache2/Makefile @@ -9,7 +9,7 @@ PORTNAME= apache PORTVERSION= 2.0.48 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www ipv6 MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD} \ http://sheepkiller.nerim.net/ports/${PORTNAME}/:powerlogo diff --git a/www/apache2/files/patch-modules:ssl:ssl_engine_io.c b/www/apache2/files/patch-modules:ssl:ssl_engine_io.c new file mode 100644 index 000000000000..e359ec540ccb --- /dev/null +++ b/www/apache2/files/patch-modules:ssl:ssl_engine_io.c @@ -0,0 +1,31 @@ +=================================================================== +RCS file: /home/cvspublic/httpd-2.0/modules/ssl/ssl_engine_io.c,v +retrieving revision 1.100.2.11 +retrieving revision 1.100.2.12 +diff -u -r1.100.2.11 -r1.100.2.12 +--- modules/ssl/ssl_engine_io.c 2004/02/09 20:53:20 1.100.2.11 ++++ modules/ssl/ssl_engine_io.c 2004/03/07 22:03:16 1.100.2.12 +@@ -821,9 +821,11 @@ + sizeof(HTTP_ON_HTTPS_PORT) - 1, \ + alloc) + +-static void ssl_io_filter_disable(ap_filter_t *f) ++static void ssl_io_filter_disable(SSLConnRec *sslconn, ap_filter_t *f) + { + bio_filter_in_ctx_t *inctx = f->ctx; ++ SSL_free(inctx->ssl); ++ sslconn->ssl = NULL; + inctx->ssl = NULL; + inctx->filter_ctx->pssl = NULL; + } +@@ -845,7 +847,7 @@ + ssl_log_ssl_error(APLOG_MARK, APLOG_INFO, f->c->base_server); + + sslconn->non_ssl_request = 1; +- ssl_io_filter_disable(f); ++ ssl_io_filter_disable(sslconn, f); + + /* fake the request line */ + bucket = HTTP_ON_HTTPS_PORT_BUCKET(f->c->bucket_alloc); + + diff --git a/www/apache20/Makefile b/www/apache20/Makefile index bb74ee1b55bb..bdb9a9a40185 100644 --- a/www/apache20/Makefile +++ b/www/apache20/Makefile @@ -9,7 +9,7 @@ PORTNAME= apache PORTVERSION= 2.0.48 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www ipv6 MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD} \ http://sheepkiller.nerim.net/ports/${PORTNAME}/:powerlogo diff --git a/www/apache20/files/patch-modules:ssl:ssl_engine_io.c b/www/apache20/files/patch-modules:ssl:ssl_engine_io.c new file mode 100644 index 000000000000..e359ec540ccb --- /dev/null +++ b/www/apache20/files/patch-modules:ssl:ssl_engine_io.c @@ -0,0 +1,31 @@ +=================================================================== +RCS file: /home/cvspublic/httpd-2.0/modules/ssl/ssl_engine_io.c,v +retrieving revision 1.100.2.11 +retrieving revision 1.100.2.12 +diff -u -r1.100.2.11 -r1.100.2.12 +--- modules/ssl/ssl_engine_io.c 2004/02/09 20:53:20 1.100.2.11 ++++ modules/ssl/ssl_engine_io.c 2004/03/07 22:03:16 1.100.2.12 +@@ -821,9 +821,11 @@ + sizeof(HTTP_ON_HTTPS_PORT) - 1, \ + alloc) + +-static void ssl_io_filter_disable(ap_filter_t *f) ++static void ssl_io_filter_disable(SSLConnRec *sslconn, ap_filter_t *f) + { + bio_filter_in_ctx_t *inctx = f->ctx; ++ SSL_free(inctx->ssl); ++ sslconn->ssl = NULL; + inctx->ssl = NULL; + inctx->filter_ctx->pssl = NULL; + } +@@ -845,7 +847,7 @@ + ssl_log_ssl_error(APLOG_MARK, APLOG_INFO, f->c->base_server); + + sslconn->non_ssl_request = 1; +- ssl_io_filter_disable(f); ++ ssl_io_filter_disable(sslconn, f); + + /* fake the request line */ + bucket = HTTP_ON_HTTPS_PORT_BUCKET(f->c->bucket_alloc); + + |