diff options
| author | Clement Laforet <clement@FreeBSD.org> | 2005-07-26 10:10:35 +0000 |
|---|---|---|
| committer | Clement Laforet <clement@FreeBSD.org> | 2005-07-26 10:10:35 +0000 |
| commit | 45df42849e11ad1831827454fabebd05bcdeedfa (patch) | |
| tree | f65c3eebf37e106efd1fd17194a5925b4b2f9e1d /www/apache2 | |
| parent | 7a67d06cd1a129231ce8dbce0d92f688beca958b (diff) | |
Notes
Diffstat (limited to 'www/apache2')
| -rw-r--r-- | www/apache2/Makefile | 2 | ||||
| -rw-r--r-- | www/apache2/files/patch-secfix-CAN-2005-1268 (renamed from www/apache2/files/patch-secfix-ssl_engine_kernel.c) | 0 | ||||
| -rw-r--r-- | www/apache2/files/patch-secfix-CAN-2005-2088 | 20 |
3 files changed, 21 insertions, 1 deletions
diff --git a/www/apache2/Makefile b/www/apache2/Makefile index 1d81c75dde42..5990a90b46ec 100644 --- a/www/apache2/Makefile +++ b/www/apache2/Makefile @@ -9,7 +9,7 @@ PORTNAME= apache PORTVERSION= 2.0.54 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD} \ ${MASTER_SITE_LOCAL:S/%SUBDIR%/clement/}:powerlogo diff --git a/www/apache2/files/patch-secfix-ssl_engine_kernel.c b/www/apache2/files/patch-secfix-CAN-2005-1268 index 3b8be849954b..3b8be849954b 100644 --- a/www/apache2/files/patch-secfix-ssl_engine_kernel.c +++ b/www/apache2/files/patch-secfix-CAN-2005-1268 diff --git a/www/apache2/files/patch-secfix-CAN-2005-2088 b/www/apache2/files/patch-secfix-CAN-2005-2088 new file mode 100644 index 000000000000..36fe17ad303c --- /dev/null +++ b/www/apache2/files/patch-secfix-CAN-2005-2088 @@ -0,0 +1,20 @@ +--- server/protocol.c 2005/07/14 16:49:17 219060 ++++ server/protocol.c 2005/07/14 16:51:55 219061 +@@ -885,6 +885,15 @@ + apr_brigade_destroy(tmp_bb); + return r; + } ++ ++ if (apr_table_get(r->headers_in, "Transfer-Encoding") ++ && apr_table_get(r->headers_in, "Content-Length")) { ++ /* 2616 section 4.4, point 3: "if both Transfer-Encoding ++ * and Content-Length are received, the latter MUST be ++ * ignored"; so unset it here to prevent any confusion ++ * later. */ ++ apr_table_unset(r->headers_in, "Content-Length"); ++ } + } + else { + if (r->header_only) { + + |