summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKonstantin V. Arkhipov <voxus@gentoo.org>2005-05-29 14:34:07 +0000
committerKonstantin V. Arkhipov <voxus@gentoo.org>2005-05-29 14:34:07 +0000
commitb27e2863cf27743bc29ecab661cf6e7ea46cca05 (patch)
treef1276e8c3ef7626f69479db80d61c990c7a899ab /www-servers
parent0.1.34 goes stable (diff)
downloadgentoo-2-b27e2863cf27743bc29ecab661cf6e7ea46cca05.tar.gz
gentoo-2-b27e2863cf27743bc29ecab661cf6e7ea46cca05.tar.bz2
gentoo-2-b27e2863cf27743bc29ecab661cf6e7ea46cca05.zip
- lost patches
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'www-servers')
-rw-r--r--www-servers/nginx/files/nginx-0.1.28-bad_backend_header.patch22
-rw-r--r--www-servers/nginx/files/nginx-0.1.29-500_bytes_long.patch15
-rw-r--r--www-servers/nginx/files/nginx-0.1.29-ignore_invalid_headers.patch121
-rw-r--r--www-servers/nginx/files/nginx-0.1.33-large_ssi_includes.patch29
-rw-r--r--www-servers/nginx/files/nginx-0.1.33-set_header_range.patch13
5 files changed, 0 insertions, 200 deletions
diff --git a/www-servers/nginx/files/nginx-0.1.28-bad_backend_header.patch b/www-servers/nginx/files/nginx-0.1.28-bad_backend_header.patch
deleted file mode 100644
index dccfaafd068d..000000000000
--- a/www-servers/nginx/files/nginx-0.1.28-bad_backend_header.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/http/modules/proxy/ngx_http_proxy_upstream.c Mon Apr 18 18:00:53 2005
-+++ src/http/modules/proxy/ngx_http_proxy_upstream.c Tue Apr 19 16:31:48 2005
-@@ -1175,7 +1175,7 @@
-
- rc = ngx_http_parse_header_line(p->request, p->header_in);
-
-- if (rc == NGX_OK) {
-+ if (rc == NGX_OK && !r->invalid_header) {
-
- /* a header line has been parsed successfully */
-
-@@ -1241,6 +1241,10 @@
- return;
-
- } else if (rc != NGX_AGAIN) {
-+
-+ if (r->invalid_header) {
-+ rc = NGX_HTTP_PARSE_INVALID_HEADER;
-+ }
-
- /* there was error while a header line parsing */
-
diff --git a/www-servers/nginx/files/nginx-0.1.29-500_bytes_long.patch b/www-servers/nginx/files/nginx-0.1.29-500_bytes_long.patch
deleted file mode 100644
index 3a3097fb06ae..000000000000
--- a/www-servers/nginx/files/nginx-0.1.29-500_bytes_long.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/http/ngx_http_upstream.c Fri May 6 22:45:06 2005
-+++ src/http/ngx_http_upstream.c Sat May 14 15:23:11 2005
-@@ -779,12 +779,6 @@
- return;
- }
-
-- if (n == NGX_HTTP_INTERNAL_SERVER_ERROR) {
-- ngx_http_upstream_finalize_request(r, u,
-- NGX_HTTP_INTERNAL_SERVER_ERROR);
-- return;
-- }
--
- u->header_in.last += n;
-
- #if 0
diff --git a/www-servers/nginx/files/nginx-0.1.29-ignore_invalid_headers.patch b/www-servers/nginx/files/nginx-0.1.29-ignore_invalid_headers.patch
deleted file mode 100644
index fe559fd355ef..000000000000
--- a/www-servers/nginx/files/nginx-0.1.29-ignore_invalid_headers.patch
+++ /dev/null
@@ -1,121 +0,0 @@
---- src/http/ngx_http_core_module.c Sat Apr 30 13:48:14 2005
-+++ src/http/ngx_http_core_module.c Fri May 13 13:26:28 2005
-@@ -144,6 +144,13 @@
- offsetof(ngx_http_core_srv_conf_t, restrict_host_names),
- &ngx_http_restrict_host_names },
-
-+ { ngx_string("ignore_invalid_headers"),
-+ NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
-+ ngx_conf_set_flag_slot,
-+ NGX_HTTP_SRV_CONF_OFFSET,
-+ offsetof(ngx_http_core_srv_conf_t, ignore_invalid_headers),
-+ NULL },
-+
- { ngx_string("location"),
- NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_BLOCK|NGX_CONF_TAKE12,
- ngx_http_core_location,
-@@ -1578,6 +1588,7 @@
- cscf->client_header_timeout = NGX_CONF_UNSET_MSEC;
- cscf->client_header_buffer_size = NGX_CONF_UNSET_SIZE;
- cscf->restrict_host_names = NGX_CONF_UNSET_UINT;
-+ cscf->ignore_invalid_headers = NGX_CONF_UNSET;
-
- return cscf;
- }
-@@ -1662,6 +1673,9 @@
-
- ngx_conf_merge_unsigned_value(conf->restrict_host_names,
- prev->restrict_host_names, 0);
-+
-+ ngx_conf_merge_value(conf->ignore_invalid_headers,
-+ prev->ignore_invalid_headers, 1);
-
- return NGX_CONF_OK;
- }
---- src/http/ngx_http_core_module.h Fri Apr 22 23:02:01 2005
-+++ src/http/ngx_http_core_module.h Fri May 13 13:22:57 2005
-@@ -87,6 +87,8 @@
- ngx_msec_t client_header_timeout;
-
- ngx_uint_t restrict_host_names;
-+
-+ ngx_flag_t ignore_invalid_headers;
- } ngx_http_core_srv_conf_t;
-
-
---- src/http/ngx_http_parse.c Mon May 2 23:49:06 2005
-+++ src/http/ngx_http_parse.c Fri May 13 13:02:47 2005
-@@ -529,6 +529,8 @@
-
- /* first char */
- case sw_start:
-+ r->invalid_header = 0;
-+
- switch (ch) {
- case CR:
- r->header_end = p;
-@@ -552,6 +554,8 @@
- break;
- }
-
-+ r->invalid_header = 1;
-+
- break;
-
- }
-@@ -605,6 +609,8 @@
- state = sw_ignore_line;
- break;
- }
-+
-+ r->invalid_header = 1;
-
- break;
-
---- src/http/ngx_http_request.c Wed May 4 12:08:43 2005
-+++ src/http/ngx_http_request.c Fri May 13 13:42:48 2005
-@@ -725,6 +725,7 @@
- ngx_connection_t *c;
- ngx_http_header_t *hh;
- ngx_http_request_t *r;
-+ ngx_http_core_srv_conf_t *cscf;
- ngx_http_core_main_conf_t *cmcf;
-
- c = rev->data;
-@@ -742,6 +743,7 @@
- }
-
- cmcf = ngx_http_get_module_main_conf(r, ngx_http_core_module);
-+ cscf = ngx_http_get_module_srv_conf(r, ngx_http_core_module);
- hh = (ngx_http_header_t *) cmcf->headers_in_hash.buckets;
-
- rc = NGX_AGAIN;
-@@ -783,8 +785,7 @@
-
- if (rc == NGX_OK) {
-
--#if 0
-- if (r->invalid_header) {
-+ if (r->invalid_header && cscf->ignore_invalid_headers) {
-
- /* there was error while a header line parsing */
-
-@@ -796,7 +797,6 @@
- &header);
- continue;
- }
--#endif
-
- /* a header line has been parsed successfully */
-
---- src/http/ngx_http_request.h Mon May 2 23:41:21 2005
-+++ src/http/ngx_http_request.h Fri May 13 12:16:38 2005
-@@ -336,6 +337,8 @@
-
- /* URI with "\0" or "%00" */
- unsigned zero_in_uri:1;
-+
-+ unsigned invalid_header:1;
-
- unsigned valid_location:1;
- unsigned valid_unparsed_uri:1;
diff --git a/www-servers/nginx/files/nginx-0.1.33-large_ssi_includes.patch b/www-servers/nginx/files/nginx-0.1.33-large_ssi_includes.patch
deleted file mode 100644
index 6acb7d86a43a..000000000000
--- a/www-servers/nginx/files/nginx-0.1.33-large_ssi_includes.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/http/ngx_http_postpone_filter_module.c Mon May 16 15:47:40 2005
-+++ src/http/ngx_http_postpone_filter_module.c Thu May 26 18:33:47 2005
-@@ -45,6 +45,7 @@
- {
- ngx_int_t rc;
- ngx_chain_t *out;
-+ ngx_http_request_t *mr;
- ngx_http_postponed_request_t *pr, **ppr;
-
- if (r->connection->write->error) {
-@@ -98,14 +99,16 @@
- out = in;
- }
-
-- if (out == NULL && r->out == NULL && !r->connection->buffered) {
-+ mr = r->main ? r->main : r;
-+
-+ if (out == NULL && mr->out == NULL && !mr->connection->buffered) {
- return NGX_OK;
- }
-
- ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
- "http postpone filter out \"%V\"", &r->uri);
-
-- rc = ngx_http_next_filter(r->main ? r->main : r, out);
-+ rc = ngx_http_next_filter(mr, out);
-
- if (rc == NGX_ERROR) {
- /* NGX_ERROR may be returned by any filter */
diff --git a/www-servers/nginx/files/nginx-0.1.33-set_header_range.patch b/www-servers/nginx/files/nginx-0.1.33-set_header_range.patch
deleted file mode 100644
index 5b05f97b1b0e..000000000000
--- a/www-servers/nginx/files/nginx-0.1.33-set_header_range.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/http/modules/ngx_http_proxy_module.c Sat May 21 18:49:18 2005
-+++ src/http/modules/ngx_http_proxy_module.c Mon May 23 16:22:30 2005
-@@ -1576,6 +1576,10 @@
-
- *name = src[i].key;
-
-+ if (src[i].value.len == 0) {
-+ continue;
-+ }
-+
- if (ngx_http_script_variables_count(&src[i].value) == 0) {
- copy = ngx_array_push_n(conf->headers_set_len,
- sizeof(ngx_http_script_copy_code_t));