diff options
| author | Shaun Amott <shaun@FreeBSD.org> | 2006-11-16 02:43:44 +0000 |
|---|---|---|
| committer | Shaun Amott <shaun@FreeBSD.org> | 2006-11-16 02:43:44 +0000 |
| commit | e67a216b3eb141e288238ed47cb05cc934fcdca8 (patch) | |
| tree | b2b4b052042bab8504d862d94c1c60e602dcdbd2 /www/cherokee | |
| parent | 8a50586c6f74db81b33dbac094fe8af71f76aef6 (diff) | |
Notes
Diffstat (limited to 'www/cherokee')
| -rw-r--r-- | www/cherokee/Makefile | 2 | ||||
| -rw-r--r-- | www/cherokee/files/patch-cherokee-connection.c | 17 | ||||
| -rw-r--r-- | www/cherokee/files/patch-cherokee-handler_cgi_base.c | 6 |
3 files changed, 11 insertions, 14 deletions
diff --git a/www/cherokee/Makefile b/www/cherokee/Makefile index 84d70334fd17..769bc30ae37a 100644 --- a/www/cherokee/Makefile +++ b/www/cherokee/Makefile @@ -7,7 +7,7 @@ PORTNAME= cherokee PORTVERSION= 0.5.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= http://www.cherokee-project.com/download/%SUBDIR%/ \ http://www.alaskaparadise.com/freebsd/ diff --git a/www/cherokee/files/patch-cherokee-connection.c b/www/cherokee/files/patch-cherokee-connection.c index 2a36cb00bae4..dbf057093582 100644 --- a/www/cherokee/files/patch-cherokee-connection.c +++ b/www/cherokee/files/patch-cherokee-connection.c @@ -1,33 +1,30 @@ ---- cherokee/connection.c.orig Wed Sep 20 21:17:53 2006 -+++ cherokee/connection.c Wed Sep 20 21:17:53 2006 -@@ -33,6 +33,12 @@ +--- cherokee/connection.c.orig Wed Aug 30 17:12:13 2006 ++++ cherokee/connection.c Thu Nov 16 00:41:26 2006 +@@ -33,6 +33,9 @@ #include <time.h> #include <sys/types.h> -+#undef fr_atoll -+#define fr_atoll(nptr) strtoll(nptr, (char **)NULL, 10) -+ +#include <stdlib.h> +#include <limits.h> + #ifdef HAVE_PWD_H # include <pwd.h> #endif -@@ -1210,7 +1216,7 @@ +@@ -1210,7 +1213,7 @@ } tmp[num_len] = '\0'; if (num_len != 0) { - cnt->range_start = atoll (tmp); -+ cnt->range_start = fr_atoll (tmp); ++ cnt->range_start = strtoll(tmp, (char **)NULL, 10); if (cnt->range_start < 0) { return ret_error; } -@@ -1236,7 +1242,7 @@ +@@ -1236,7 +1239,7 @@ num_len++; } tmp[num_len] = '\0'; - cnt->range_end = atoll (tmp); -+ cnt->range_end = fr_atoll (tmp); ++ cnt->range_end = strtoll(tmp, (char **)NULL, 10); if (cnt->range_end < 1){ return ret_error; } diff --git a/www/cherokee/files/patch-cherokee-handler_cgi_base.c b/www/cherokee/files/patch-cherokee-handler_cgi_base.c index 7270ff234a64..f929a12f7e9f 100644 --- a/www/cherokee/files/patch-cherokee-handler_cgi_base.c +++ b/www/cherokee/files/patch-cherokee-handler_cgi_base.c @@ -1,5 +1,5 @@ ---- cherokee/handler_cgi_base.c.orig Wed Sep 20 21:17:09 2006 -+++ cherokee/handler_cgi_base.c Wed Sep 20 21:17:09 2006 +--- cherokee/handler_cgi_base.c.orig Fri Aug 18 15:21:03 2006 ++++ cherokee/handler_cgi_base.c Thu Nov 16 00:42:03 2006 @@ -21,6 +21,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * USA @@ -14,7 +14,7 @@ cherokee_buffer_add (&tmp, begin+16, end - (begin+16)); - cgi->content_length = atoll (tmp.buf); -+ cgi->content_length = fr_atoll (tmp.buf); ++ cgi->content_length = strtoll(tmp.buf, (char **)NULL, 10); cherokee_buffer_mrproper (&tmp); cherokee_buffer_remove_chunk (buffer, begin - buffer->buf, end2 - begin); |