Attachment #73664 for bug #106731

View | Details | Raw Unified | Return to bug 106731
Collapse All | Expand All

Lines 6-13 Link Here

(-)/usr/ports/www/cherokee/Makefile (-2 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= cherokee	8	PORTNAME= cherokee
9	PORTVERSION= 0.5.5	9	PORTVERSION= 0.5.6
10	PORTREVISION= 2	10	PORTREVISION=
11	CATEGORIES= www	11	CATEGORIES= www
12	MASTER_SITES= http://www.cherokee-project.com/download/%SUBDIR%/ \	12	MASTER_SITES= http://www.cherokee-project.com/download/%SUBDIR%/ \
13	http://www.alaskaparadise.com/freebsd/	13	http://www.alaskaparadise.com/freebsd/

Lines 1-3 Link Here

(-)/usr/ports/www/cherokee/distinfo (-3 / +3 lines)
1	MD5 (cherokee-0.5.5.tar.gz) = fb891b3da7eb921c09a5eb93e296f5e1	1	MD5 (cherokee-0.5.6.tar.gz) = 0c5ae67c296f7e080900b23e533efd0b
2	SHA256 (cherokee-0.5.5.tar.gz) = e9c6feee2a626a38cd69c726ed31ffbbf55d288386f50fe6f90fa63de410d67a	2	SHA256 (cherokee-0.5.6.tar.gz) = d19ac8a85c252ccfe04c06ce0ec9b03d036b27d07c6db4601ce7d6b33c4e9cc8
3	SIZE (cherokee-0.5.5.tar.gz) = 1559655	3	SIZE (cherokee-0.5.6.tar.gz) = 1392282




--- cherokee/connection.c.orig	Mon Dec 11 11:44:26 2006
+++ cherokee/connection.c	Thu Dec 14 09:50:08 2006
@@ -32,6 +32,7 @@
 #include <fcntl.h>
 #include <time.h>
 #include <sys/types.h>
 
+#include <stdlib.h>
+#include <limits.h>
 
 #ifdef HAVE_PWD_H
 # include <pwd.h>
 #endif
@@ -1210,7 +1213,7 @@
 	}
 	tmp[num_len] = '\0';
 	if (num_len != 0) {
-		cnt->range_start = atoll (tmp);
+		cnt->range_start = strtoll(tmp, (char **)NULL, 10);
 		if (cnt->range_start < 0) {
 			return ret_error;
 		}
@@ -1236,7 +1239,7 @@
 			num_len++;
 		}
 		tmp[num_len] = '\0';
-		cnt->range_end = atoll (tmp);
+		cnt->range_end = strtoll(tmp, (char **)NULL, 10);
 		if (cnt->range_end < 1){
 			return ret_error;
 		}

Lines 1-10 Link Here

(-)/usr/ports/www/cherokee/files/patch-cherokee-fdpoll-kqueue.c (-10 lines)
1	--- cherokee/fdpoll-kqueue.c.orig Wed Sep 13 21:45:31 2006
2	+++ cherokee/fdpoll-kqueue.c Wed Sep 13 21:45:13 2006
3	@@ -27,6 +27,7 @@
4	#include "fdpoll-protected.h"
5
6	#include <stdio.h>
7	+#include <sys/types.h>
8	#include <sys/event.h>
9	#include <sys/time.h>
10	#include <unistd.h>




--- cherokee/handler_cgi_base.c.orig	Mon Dec 11 11:44:26 2006
+++ cherokee/handler_cgi_base.c	Thu Dec 14 10:09:38 2006
@@ -21,7 +21,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
  * USA
  */
-
+#include <stdlib.h>
+#include <limits.h>
 
 #include "common-internal.h"
 #include "handler_cgi_base.h"
@@ -578,7 +580,7 @@
 			cherokee_buffer_t tmp = CHEROKEE_BUF_INIT;
 
 			cherokee_buffer_add (&tmp, begin+16, end - (begin+16));
-			cgi->content_length = 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);

Lines 1-6 Link Here

(-)/usr/ports/www/cherokee/files/patch-cherokee-socket.c (-3 / +3 lines)
1	--- cherokee/socket.c.orig Wed Sep 13 21:48:51 2006	1	--- cherokee/socket.c.orig Thu Dec 7 09:46:29 2006
2	+++ cherokee/socket.c Wed Sep 13 22:06:35 2006	2	+++ cherokee/socket.c Thu Dec 14 10:35:48 2006
3	@@ -1122,13 +1122,17 @@	3	@@ -1153,13 +1153,17 @@
4	cherokee_socket_init_client_tls (cherokee_socket_t *socket)	4	cherokee_socket_init_client_tls (cherokee_socket_t *socket)
5	{	5	{
6	#ifdef HAVE_TLS	6	#ifdef HAVE_TLS




--- cherokee/socket.h.orig	Sun Mar  6 08:09:33 2005
+++ cherokee/socket.h	Fri Apr  1 13:09:44 2005
@@ -45,12 +45,12 @@
 # include <sys/socket.h>
 #endif
 
-#ifdef HAVE_ARPA_INET_H
-# include <arpa/inet.h>
-#endif
-
 #ifdef HAVE_NETINET_IN_H
 # include <netinet/in.h>
+#endif
+
+#ifdef HAVE_ARPA_INET_H
+# include <arpa/inet.h>
 #endif
 
 #if defined(HAVE_GNUTLS)

Return to bug 106731

Lines 1-30 Link Here

(-)/usr/ports/www/cherokee/files/patch-cherokee-connection.c (-25 / +5 lines)
1	--- cherokee/connection.c.orig Wed Aug 30 17:12:13 2006	1	--- cherokee/connection.c.orig Mon Dec 11 11:44:26 2006
2	+++ cherokee/connection.c Thu Nov 16 00:41:26 2006	2	+++ cherokee/connection.c Thu Dec 14 09:50:08 2006
3	@@ -33,6 +33,9 @@	3	@@ -32,6 +32,7 @@
		4	#include <fcntl.h>
4	#include <time.h>	5	#include <time.h>
5	#include <sys/types.h>	6	#include <sys/types.h>
6
7	+#include <stdlib.h>
8	+#include <limits.h>	7	+#include <limits.h>
9	+	8
10	#ifdef HAVE_PWD_H	9	#ifdef HAVE_PWD_H
11	# include <pwd.h>	10	# include <pwd.h>
12	#endif
13	@@ -1210,7 +1213,7 @@
14	}
15	tmp[num_len] = '\0';
16	if (num_len != 0) {
17	- cnt->range_start = atoll (tmp);
18	+ cnt->range_start = strtoll(tmp, (char **)NULL, 10);
19	if (cnt->range_start < 0) {
20	return ret_error;
21	}
22	@@ -1236,7 +1239,7 @@
23	num_len++;
24	}
25	tmp[num_len] = '\0';
26	- cnt->range_end = atoll (tmp);
27	+ cnt->range_end = strtoll(tmp, (char **)NULL, 10);
28	if (cnt->range_end < 1){
29	return ret_error;
30	}

Lines 1-20 Link Here

(-)/usr/ports/www/cherokee/files/patch-cherokee-handler_cgi_base.c (-12 / +4 lines)
1	--- cherokee/handler_cgi_base.c.orig Fri Aug 18 15:21:03 2006	1	--- cherokee/handler_cgi_base.c.orig Mon Dec 11 11:44:26 2006
2	+++ cherokee/handler_cgi_base.c Thu Nov 16 00:42:03 2006	2	+++ cherokee/handler_cgi_base.c Thu Dec 14 10:09:38 2006
3	@@ -21,6 +21,8 @@	3	@@ -21,7 +21,8 @@
4	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307	4	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
5	* USA	5	* USA
6	*/	6	*/
		7	-
7	+#include <stdlib.h>	8	+#include <stdlib.h>
8	+#include <limits.h>	9	+#include <limits.h>
9
10	#include "common-internal.h"	10	#include "common-internal.h"
11	#include "handler_cgi_base.h"	11	#include "handler_cgi_base.h"
12	@@ -578,7 +580,7 @@
13	cherokee_buffer_t tmp = CHEROKEE_BUF_INIT;
14
15	cherokee_buffer_add (&tmp, begin+16, end - (begin+16));
16	- cgi->content_length = atoll (tmp.buf);
17	+ cgi->content_length = strtoll(tmp.buf, (char **)NULL, 10);
18	cherokee_buffer_mrproper (&tmp);
19		12
20	cherokee_buffer_remove_chunk (buffer, begin - buffer->buf, end2 - begin);

Lines 1-19 Link Here

(-)/usr/ports/www/cherokee/files/patch-cherokee-socket.h (-19 lines)
1	--- cherokee/socket.h.orig Sun Mar 6 08:09:33 2005
2	+++ cherokee/socket.h Fri Apr 1 13:09:44 2005
3	@@ -45,12 +45,12 @@
4	# include <sys/socket.h>
5	#endif
6
7	-#ifdef HAVE_ARPA_INET_H
8	-# include <arpa/inet.h>
9	-#endif
10	-
11	#ifdef HAVE_NETINET_IN_H
12	# include <netinet/in.h>
13	+#endif
14	+
15	+#ifdef HAVE_ARPA_INET_H
16	+# include <arpa/inet.h>
17	#endif
18
19	#if defined(HAVE_GNUTLS)