1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-01 05:45:45 +00:00

Fix port - it compiled, but the daemon failed to start completely.

Reported by:	Beech Rintoul <beech@alaskaparadise.com> (maintainer)
This commit is contained in:
Shaun Amott 2006-11-16 02:43:44 +00:00
parent 8a50586c6f
commit e67a216b3e
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=177373
6 changed files with 22 additions and 28 deletions

View File

@ -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/

View File

@ -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;
}

View File

@ -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);

View File

@ -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/

View File

@ -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;
}

View File

@ -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);