summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Holland <tigger@gentoo.org>2005-07-28 14:07:17 +0000
committerRob Holland <tigger@gentoo.org>2005-07-28 14:07:17 +0000
commit90c96f6ddd7178f1a69f6eaa94082a0d7ac0d839 (patch)
treeb43433137d0e56848a5aa74a47cc1326dd02b00b /www-servers/boa/files
parentremove d.g.o/me (diff)
downloadgentoo-2-90c96f6ddd7178f1a69f6eaa94082a0d7ac0d839.tar.gz
gentoo-2-90c96f6ddd7178f1a69f6eaa94082a0d7ac0d839.tar.bz2
gentoo-2-90c96f6ddd7178f1a69f6eaa94082a0d7ac0d839.zip
Small tidy ups. 64bit fixes. Don't stop the boa service when installing.
(Portage version: 2.0.51.22-r2)
Diffstat (limited to 'www-servers/boa/files')
-rw-r--r--www-servers/boa/files/boa-0.94.14_alpha20-64bit.patch50
-rw-r--r--www-servers/boa/files/digest-boa-0.94.14_alpha20-r11
2 files changed, 51 insertions, 0 deletions
diff --git a/www-servers/boa/files/boa-0.94.14_alpha20-64bit.patch b/www-servers/boa/files/boa-0.94.14_alpha20-64bit.patch
new file mode 100644
index 000000000000..ff44da366884
--- /dev/null
+++ b/www-servers/boa/files/boa-0.94.14_alpha20-64bit.patch
@@ -0,0 +1,50 @@
+diff -urN src/mmap_cache.c /tmp/src/mmap_cache.c
+--- src/mmap_cache.c 2004-06-04 03:44:59.000000000 +0100
++++ /tmp/src/mmap_cache.c 2005-07-28 14:40:50.320610000 +0100
+@@ -79,7 +79,7 @@
+
+ m = mmap(0, s->st_size, PROT_READ, MAP_OPTIONS, data_fd, 0);
+
+- if ((int) m == -1) {
++ if (m == MAP_FAILED) {
+ int saved_errno = errno;
+ log_error_time();
+ fprintf(stderr, "Unable to mmap file: ");
+diff -urN src/read.c /tmp/src/read.c
+--- src/read.c 2004-06-10 03:00:32.000000000 +0100
++++ /tmp/src/read.c 2005-07-28 14:40:50.320610000 +0100
+@@ -40,6 +40,7 @@
+ {
+ int bytes;
+ unsigned char *check, *buffer;
++ size_t len;
+
+ check = req->client_stream + req->parse_pos;
+ buffer = req->client_stream;
+@@ -115,10 +116,11 @@
+ if (req->status == ONE_LF) {
+ *req->header_end = '\0';
+
+- if (req->header_end - req->header_line >= MAX_HEADER_LENGTH) {
++ len = req->header_end - req->header_line;
++ if (len >= MAX_HEADER_LENGTH) {
+ log_error_doc(req);
+- fprintf(stderr, "Header too long at %d bytes: \"%s\"\n",
+- req->header_end - req->header_line,
++ fprintf(stderr, "Header too long at %lu bytes: \"%s\"\n",
++ len,
+ req->header_line);
+ send_r_bad_request(req);
+ return 0;
+diff -urN src/request.c /tmp/src/request.c
+--- src/request.c 2004-06-10 02:45:13.000000000 +0100
++++ /tmp/src/request.c 2005-07-28 14:40:50.320610000 +0100
+@@ -85,7 +85,7 @@
+ struct SOCKADDR salocal;
+ unsigned int remote_addrlen = sizeof (struct SOCKADDR);
+ request *conn; /* connection */
+- size_t len;
++ socklen_t len;
+
+ #ifndef INET6
+ remote_addr.S_FAMILY = (sa_family_t) 0xdead;
diff --git a/www-servers/boa/files/digest-boa-0.94.14_alpha20-r1 b/www-servers/boa/files/digest-boa-0.94.14_alpha20-r1
new file mode 100644
index 000000000000..e9b0a2bf2d22
--- /dev/null
+++ b/www-servers/boa/files/digest-boa-0.94.14_alpha20-r1
@@ -0,0 +1 @@
+MD5 046d1764cd8f325109da9c80c993b2ef boa-0.94.14rc20.tar.gz 200395