Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current/.git;a=commitdiff;h=73f225cfcafcdb7265ebd822b630e389d516ee16
commit 73f225cfcafcdb7265ebd822b630e389d516ee16
Author: VMiklos <[EMAIL PROTECTED]>
Date: Fri Aug 3 10:45:14 2007 +0200
lighttpd-1.4.16-1-i686
remove unused patch
diff --git a/source/network-extra/lighttpd/SA26130.patch
b/source/network-extra/lighttpd/SA26130.patch
deleted file mode 100644
index c242f9c..0000000
--- a/source/network-extra/lighttpd/SA26130.patch
+++ /dev/null
@@ -1,483 +0,0 @@
-diff -Naur lighttpd-1.4.15/NEWS lighttpd-1.4.15-sec/NEWS
---- lighttpd-1.4.15/NEWS 2007-04-13 22:50:48.000000000 +0200
-+++ lighttpd-1.4.15-sec/NEWS 2007-07-21 13:19:27.000000000 +0200
-@@ -8,12 +8,21 @@
- * fixed broken Set-Cookie headers
-
- - 1.4.14 - 2007-04-13
-+ * fixed accepting more connections then requested (#1216)
-
- * fix crash if gethostbyaddr() failed on redirect [1718]
- * properly handle 206 responses generated by *cgi scripts. (#755) [1716]
- * added HTTPS=on to the environment of cgi scripts (#861) [1684]
- * fix handling of 303 (#1045) [1678]
-+ * fixed mem-leak in mod_auth (reported by Stefan Esser)
-+ * fixed crash with md5-sess and cnonce not set in mod_auth (reported by
Stefan Esser)
-+ * fixed missing check for base64 encoded string in mod_auth and Basic auth
-+ (reported by Stefan Esser)
-+ * fixed possible crash in Auth-Digest header parser on trailing WS in
-+ mod_auth (reported by Stefan Esser)
- * made the configure check for lua more portable [1677]
-+ * fixed crash on 32bit archs when debug-msgs are printed in mod_scgi,
mod_fastcgi
-+ and mod_webdav (#1263)
- * added mod_extforward module [1665]
- * references to the fam stat cache engine should be conditional (#1039)
[1664]
- * fix http 500 errors (colin.stephen/at/o2.com) #1041 [1663]
-diff -Naur lighttpd-1.4.15/src/connections.c
lighttpd-1.4.15-sec/src/connections.c
---- lighttpd-1.4.15/src/connections.c 2007-04-13 17:26:31.000000000 +0200
-+++ lighttpd-1.4.15-sec/src/connections.c 2007-07-21 13:19:01.000000000
+0200
-@@ -1252,6 +1252,16 @@
- socklen_t cnt_len;
- /* accept it and register the fd */
-
-+ /**
-+ * check if we can still open a new connections
-+ *
-+ * see #1216
-+ */
-+
-+ if (srv->conns->used >= srv->max_conns) {
-+ return NULL;
-+ }
-+
- cnt_len = sizeof(cnt_addr);
-
- if (-1 == (cnt = accept(srv_socket->fd, (struct sockaddr *) &cnt_addr,
&cnt_len))) {
-@@ -1265,6 +1275,9 @@
- case ECONNABORTED: /* this is a FreeBSD thingy */
- /* we were stopped _after_ we had a connection */
- break;
-+ case EMFILE:
-+ /* out of fds */
-+ break;
- default:
- log_error_write(srv, __FILE__, __LINE__, "ssd", "accept
failed:", strerror(errno), errno);
- }
-diff -Naur lighttpd-1.4.15/src/http_auth.c lighttpd-1.4.15-sec/src/http_auth.c
---- lighttpd-1.4.15/src/http_auth.c 2007-04-13 17:26:31.000000000 +0200
-+++ lighttpd-1.4.15-sec/src/http_auth.c 2007-07-21 13:18:47.000000000
+0200
-@@ -830,7 +830,13 @@
-
- username = buffer_init();
-
-- base64_decode(username, realm_str);
-+ if (!base64_decode(username, realm_str)) {
-+ buffer_free(username);
-+
-+ log_error_write(srv, __FILE__, __LINE__, "sb", "decodeing
base64-string failed", username);
-+
-+ return 0;
-+ }
-
- /* r2 == user:password */
- if (NULL == (pw = strchr(username->ptr, ':'))) {
-@@ -967,7 +973,7 @@
- for (c = b->ptr; *c; c++) {
- /* skip whitespaces */
- while (*c == ' ' || *c == '\t') c++;
-- if (!c) break;
-+ if (!*c) break;
-
- for (i = 0; dkv[i].key; i++) {
- if ((0 == strncmp(c, dkv[i].key, dkv[i].key_len))) {
-@@ -1016,6 +1022,21 @@
-
- log_error_write(srv, __FILE__, __LINE__, "s",
- "digest: missing field");
-+
-+ buffer_free(b);
-+ return -1;
-+ }
-+
-+ /**
-+ * protect the md5-sess against missing cnonce and nonce
-+ */
-+ if (algorithm &&
-+ 0 == strcasecmp(algorithm, "md5-sess") &&
-+ (!nonce || !cnonce)) {
-+ log_error_write(srv, __FILE__, __LINE__, "s",
-+ "digest: (md5-sess: missing field");
-+
-+ buffer_free(b);
- return -1;
- }
-
-diff -Naur lighttpd-1.4.15/src/mod_access.c
lighttpd-1.4.15-sec/src/mod_access.c
---- lighttpd-1.4.15/src/mod_access.c 2007-02-08 17:34:46.000000000 +0100
-+++ lighttpd-1.4.15-sec/src/mod_access.c 2007-07-21 13:19:17.000000000
+0200
-@@ -111,6 +111,15 @@
- }
- #undef PATCH
-
-+/**
-+ * URI handler
-+ *
-+ * we will get called twice:
-+ * - after the clean up of the URL and
-+ * - after the pathinfo checks are done
-+ *
-+ * this handles the issue of trailing slashes
-+ */
- URIHANDLER_FUNC(mod_access_uri_handler) {
- plugin_data *p = p_d;
- int s_len;
-@@ -122,28 +131,41 @@
-
- s_len = con->uri.path->used - 1;
-
-+ if (con->conf.log_request_handling) {
-+ log_error_write(srv, __FILE__, __LINE__, "s",
-+ "-- mod_access_uri_handler called");
-+ }
-+
- for (k = 0; k < p->conf.access_deny->used; k++) {
- data_string *ds = (data_string *)p->conf.access_deny->data[k];
- int ct_len = ds->value->used - 1;
-+ int denied = 0;
-
-- if (ct_len > s_len) continue;
-
-+ if (ct_len > s_len) continue;
- if (ds->value->used == 0) continue;
-
- /* if we have a case-insensitive FS we have to lower-case the
URI here too */
-
- if (con->conf.force_lowercase_filenames) {
- if (0 == strncasecmp(con->uri.path->ptr + s_len -
ct_len, ds->value->ptr, ct_len)) {
-- con->http_status = 403;
--
-- return HANDLER_FINISHED;
-+ denied = 1;
- }
- } else {
- if (0 == strncmp(con->uri.path->ptr + s_len - ct_len,
ds->value->ptr, ct_len)) {
-- con->http_status = 403;
-+ denied = 1;
-+ }
-+ }
-
-- return HANDLER_FINISHED;
-+ if (denied) {
-+ con->http_status = 403;
-+
-+ if (con->conf.log_request_handling) {
-+ log_error_write(srv, __FILE__, __LINE__, "sb",
-+ "url denied as we match:", ds->value);
- }
-+
-+ return HANDLER_FINISHED;
- }
- }
-
-@@ -158,7 +180,8 @@
-
- p->init = mod_access_init;
- p->set_defaults = mod_access_set_defaults;
-- p->handle_uri_clean = mod_access_uri_handler;
-+ p->handle_uri_clean = mod_access_uri_handler;
-+ p->handle_subrequest_start = mod_access_uri_handler;
- p->cleanup = mod_access_free;
-
- p->data = NULL;
-diff -Naur lighttpd-1.4.15/src/mod_fastcgi.c
lighttpd-1.4.15-sec/src/mod_fastcgi.c
---- lighttpd-1.4.15/src/mod_fastcgi.c 2007-04-13 17:26:31.000000000 +0200
-+++ lighttpd-1.4.15-sec/src/mod_fastcgi.c 2007-07-21 13:19:27.000000000
+0200
-@@ -2964,7 +2964,7 @@
- *
- */
-
-- log_error_write(srv, __FILE__, __LINE__,
"ssdsd",
-+ log_error_write(srv, __FILE__, __LINE__,
"ssosd",
- "[REPORT ME] connection was
dropped after accept(). reconnect() denied:",
- "write-offset:",
hctx->wb->bytes_out,
- "reconnect attempts:",
hctx->reconnects);
-diff -Naur lighttpd-1.4.15/src/mod_scgi.c lighttpd-1.4.15-sec/src/mod_scgi.c
---- lighttpd-1.4.15/src/mod_scgi.c 2007-02-08 17:34:45.000000000 +0100
-+++ lighttpd-1.4.15-sec/src/mod_scgi.c 2007-07-21 13:19:27.000000000 +0200
-@@ -2286,7 +2286,7 @@
- *
- */
-
-- log_error_write(srv, __FILE__, __LINE__,
"ssdsd",
-+ log_error_write(srv, __FILE__, __LINE__,
"ssosd",
- "[REPORT ME] connection was
dropped after accept(). reconnect() denied:",
- "write-offset:",
hctx->wb->bytes_out,
- "reconnect attempts:",
hctx->reconnects);
-@@ -2536,7 +2536,7 @@
- return HANDLER_WAIT_FOR_FD;
- }
-
-- log_error_write(srv, __FILE__, __LINE__,
"sdsdsd",
-+ log_error_write(srv, __FILE__, __LINE__,
"sosdsd",
- "response not sent, request
sent:", hctx->wb->bytes_out,
- "connection-fd:", con->fd,
- "fcgi-fd:", hctx->fd);
-diff -Naur lighttpd-1.4.15/src/mod_webdav.c
lighttpd-1.4.15-sec/src/mod_webdav.c
---- lighttpd-1.4.15/src/mod_webdav.c 2007-04-13 17:26:31.000000000 +0200
-+++ lighttpd-1.4.15-sec/src/mod_webdav.c 2007-07-21 13:19:27.000000000
+0200
-@@ -1035,7 +1035,7 @@
- }
-
- if (XML_ERR_OK != (err = xmlParseChunk(ctxt,
c->file.mmap.start + c->offset, weHave, 0))) {
-- log_error_write(srv, __FILE__, __LINE__,
"sddd", "xmlParseChunk failed at:", cq->bytes_out, weHave, err);
-+ log_error_write(srv, __FILE__, __LINE__,
"sodd", "xmlParseChunk failed at:", cq->bytes_out, weHave, err);
- }
-
- c->offset += weHave;
-@@ -1053,7 +1053,7 @@
- }
-
- if (XML_ERR_OK != (err = xmlParseChunk(ctxt,
c->mem->ptr + c->offset, weHave, 0))) {
-- log_error_write(srv, __FILE__, __LINE__,
"sddd", "xmlParseChunk failed at:", cq->bytes_out, weHave, err);
-+ log_error_write(srv, __FILE__, __LINE__,
"sodd", "xmlParseChunk failed at:", cq->bytes_out, weHave, err);
- }
-
- c->offset += weHave;
-diff -Naur lighttpd-1.4.15/src/request.c lighttpd-1.4.15-sec/src/request.c
---- lighttpd-1.4.15/src/request.c 2007-04-13 17:26:31.000000000 +0200
-+++ lighttpd-1.4.15-sec/src/request.c 2007-07-21 13:17:56.000000000 +0200
-@@ -284,8 +284,6 @@
-
- int done = 0;
-
-- data_string *ds = NULL;
--
- /*
- * Request: "^(GET|POST|HEAD) ([^ ]+(\\?[^ ]+|)) (HTTP/1\\.[01])$"
- * Option : "^([-a-zA-Z]+): (.+)$"
-@@ -715,12 +713,24 @@
- switch(*cur) {
- case '\r':
- if (con->parse_request->ptr[i+1] == '\n') {
-+ data_string *ds = NULL;
-+
- /* End of Headerline */
- con->parse_request->ptr[i] = '\0';
- con->parse_request->ptr[i+1] = '\0';
-
- if (in_folding) {
-- if (!ds) {
-+ buffer *key_b;
-+ /**
-+ * we use a evil hack to handle
the line-folding
-+ *
-+ * As array_insert_unique()
deletes 'ds' in the case of a duplicate
-+ * ds points somewhere and we
get a evil crash. As a solution we keep the old
-+ * "key" and get the current
value from the hash and append us
-+ *
-+ * */
-+
-+ if (!key || !key_len) {
- /* 400 */
-
- if
(srv->srvconf.log_request_header_on_error) {
-@@ -737,7 +747,15 @@
-
con->response.keep_alive = 0;
- return 0;
- }
-- buffer_append_string(ds->value,
value);
-+
-+ key_b = buffer_init();
-+ buffer_copy_string_len(key_b,
key, key_len);
-+
-+ if (NULL != (ds = (data_string
*)array_get_element(con->request.headers, key_b->ptr))) {
-+
buffer_append_string(ds->value, value);
-+ }
-+
-+ buffer_free(key_b);
- } else {
- int s_len;
- key = con->parse_request->ptr +
first;
-@@ -969,7 +987,12 @@
- first = i+1;
- is_key = 1;
- value = 0;
-- key_len = 0;
-+#if 0
-+ /**
-+ * for Bug 1230 keep the key_len a live
-+ */
-+ key_len = 0;
-+#endif
- in_folding = 0;
- } else {
- if
(srv->srvconf.log_request_header_on_error) {
-diff -Naur lighttpd-1.4.15/src/server.c lighttpd-1.4.15-sec/src/server.c
---- lighttpd-1.4.15/src/server.c 2007-04-13 17:26:31.000000000 +0200
-+++ lighttpd-1.4.15-sec/src/server.c 2007-07-21 13:19:01.000000000 +0200
-@@ -775,6 +775,22 @@
- return -1;
- }
-
-+ /**
-+ * we are not root can can't increase the fd-limit, but we can
reduce it
-+ */
-+ if (srv->srvconf.max_fds && srv->srvconf.max_fds <
rlim.rlim_cur) {
-+ /* set rlimits */
-+
-+ rlim.rlim_cur = srv->srvconf.max_fds;
-+
-+ if (0 != setrlimit(RLIMIT_NOFILE, &rlim)) {
-+ log_error_write(srv, __FILE__, __LINE__,
-+ "ss", "couldn't set 'max
filedescriptors'",
-+ strerror(errno));
-+ return -1;
-+ }
-+ }
-+
- if (srv->event_handler == FDEVENT_HANDLER_SELECT) {
- srv->max_fds = rlim.rlim_cur < FD_SETSIZE - 200 ?
rlim.rlim_cur : FD_SETSIZE - 200;
- } else {
-diff -Naur lighttpd-1.4.15/tests/core-request.t
lighttpd-1.4.15-sec/tests/core-request.t
---- lighttpd-1.4.15/tests/core-request.t 2007-02-08 17:34:47.000000000
+0100
-+++ lighttpd-1.4.15-sec/tests/core-request.t 2007-07-21 13:17:56.000000000
+0200
-@@ -8,7 +8,7 @@
-
- use strict;
- use IO::Socket;
--use Test::More tests => 33;
-+use Test::More tests => 36;
- use LightyTest;
-
- my $tf = LightyTest->new();
-@@ -273,6 +273,38 @@
- $t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200 } ];
- ok($tf->handle_http($t) == 0, 'uppercase filenames');
-
-+$t->{REQUEST} = ( <<EOF
-+GET / HTTP/1.0
-+Location: foo
-+Location: foobar
-+ baz
-+EOF
-+ );
-+$t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200 } ];
-+ok($tf->handle_http($t) == 0, '#1209 - duplicate headers with line-wrapping');
-+
-+$t->{REQUEST} = ( <<EOF
-+GET / HTTP/1.0
-+Location:
-+Location: foobar
-+ baz
-+EOF
-+ );
-+$t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200 } ];
-+ok($tf->handle_http($t) == 0, '#1209 - duplicate headers with line-wrapping -
test 2');
-+
-+$t->{REQUEST} = ( <<EOF
-+GET / HTTP/1.0
-+A:
-+Location: foobar
-+ baz
-+EOF
-+ );
-+$t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200 } ];
-+ok($tf->handle_http($t) == 0, '#1209 - duplicate headers with line-wrapping -
test 3');
-+
-+
-+
-
- ok($tf->stop_proc == 0, "Stopping lighttpd");
-
-diff -Naur lighttpd-1.4.15/tests/docroot/www/Makefile.am
lighttpd-1.4.15-sec/tests/docroot/www/Makefile.am
---- lighttpd-1.4.15/tests/docroot/www/Makefile.am 2007-02-08
17:34:47.000000000 +0100
-+++ lighttpd-1.4.15-sec/tests/docroot/www/Makefile.am 2007-07-21
13:19:17.000000000 +0200
-@@ -1,5 +1,5 @@
- EXTRA_DIST=cgi.php cgi.pl dummydir index.html index.txt phpinfo.php \
- redirect.php cgi-pathinfo.pl get-env.php get-server-env.php \
- nph-status.pl prefix.fcgi get-header.pl ssi.shtml get-post-len.pl \
-- exec-date.shtml
-+ exec-date.shtml index.html~
- SUBDIRS=go indexfile expire
-diff -Naur lighttpd-1.4.15/tests/mod-access.t
lighttpd-1.4.15-sec/tests/mod-access.t
---- lighttpd-1.4.15/tests/mod-access.t 2007-02-08 17:34:47.000000000 +0100
-+++ lighttpd-1.4.15-sec/tests/mod-access.t 2007-07-21 13:19:17.000000000
+0200
-@@ -8,7 +8,7 @@
-
- use strict;
- use IO::Socket;
--use Test::More tests => 3;
-+use Test::More tests => 4;
- use LightyTest;
-
- my $tf = LightyTest->new();
-@@ -23,5 +23,12 @@
- $t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 403 } ];
- ok($tf->handle_http($t) == 0, 'forbid access to ...~');
-
-+$t->{REQUEST} = ( <<EOF
-+GET /index.html~/ HTTP/1.0
-+EOF
-+ );
-+$t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 403 } ];
-+ok($tf->handle_http($t) == 0, '#1230 - forbid access to ...~ - trailing
slash');
-+
- ok($tf->stop_proc == 0, "Stopping lighttpd");
-
-diff -Naur lighttpd-1.4.15/tests/mod-auth.t
lighttpd-1.4.15-sec/tests/mod-auth.t
---- lighttpd-1.4.15/tests/mod-auth.t 2007-02-08 17:34:47.000000000 +0100
-+++ lighttpd-1.4.15-sec/tests/mod-auth.t 2007-07-21 13:18:47.000000000
+0200
-@@ -8,7 +8,7 @@
-
- use strict;
- use IO::Socket;
--use Test::More tests => 10;
-+use Test::More tests => 13;
- use LightyTest;
-
- my $tf = LightyTest->new();
-@@ -93,6 +93,43 @@
- $t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 400 } ];
- ok($tf->handle_http($t) == 0, 'Digest-Auth: missing nc (noncecount instead),
no crash');
-
-+$t->{REQUEST} = ( <<EOF
-+GET /server-status HTTP/1.0
-+Authorization: Basic =
-+EOF
-+ );
-+$t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 401 } ];
-+ok($tf->handle_http($t) == 0, 'Basic-Auth: Invalid Base64');
-+
-+
-+$t->{REQUEST} = ( <<EOF
-+GET /server-status HTTP/1.0
-+User-Agent: Wget/1.9.1
-+Authorization: Digest username="jan", realm="jan",
-+ nonce="b1d12348b4620437c43dd61c50ae4639", algorithm="md5-sess",
-+ uri="/MJ-BONG.xm.mpc", qop=auth, noncecount=00000001",
-+ cnonce="036FCA5B86F7E7C4965C7F9B8FE714B7",
-+ nc="asd",
-+ response="29B32C2953C763C6D033C8A49983B87E"
-+EOF
-+ );
-+$t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 401 } ];
-+ok($tf->handle_http($t) == 0, 'Digest-Auth: md5-sess + missing cnonce');
-+
-+$t->{REQUEST} = ( <<EOF
-+GET /server-status HTTP/1.0
-+User-Agent: Wget/1.9.1
-+Authorization: Digest username="jan", realm="jan",
-+ nonce="b1d12348b4620437c43dd61c50ae4639", algorithm="md5-sess",
-+ uri="/MJ-BONG.xm.mpc", qop=auth, noncecount=00000001",
-+ cnonce="036FCA5B86F7E7C4965C7F9B8FE714B7",
-+ nc="asd",
-+ response="29B32C2953C763C6D033C8A49983B87E"
-+EOF
-+ );
-+$t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 401 } ];
-+ok($tf->handle_http($t) == 0, 'Digest-Auth: trailing WS');
-+
-
-
- ok($tf->stop_proc == 0, "Stopping lighttpd");
-diff -Naur lighttpd-1.4.15/tests/prepare.sh
lighttpd-1.4.15-sec/tests/prepare.sh
---- lighttpd-1.4.15/tests/prepare.sh 2007-02-08 17:34:48.000000000 +0100
-+++ lighttpd-1.4.15-sec/tests/prepare.sh 2007-07-21 13:19:17.000000000
+0200
-@@ -25,6 +25,7 @@
- # copy everything into the right places
- cp $srcdir/docroot/www/*.html \
- $srcdir/docroot/www/*.php \
-+ $srcdir/docroot/www/*.html~ \
- $srcdir/docroot/www/*.pl \
- $srcdir/docroot/www/*.fcgi \
- $srcdir/docroot/www/*.shtml \
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git
