Permalink
Browse files

git-svn-id: svn://cherokee-project.com/cherokee/trunk@466 5dc97367-97…

…f1-0310-9951-d761b3857238
  • Loading branch information...
alobbs committed Nov 16, 2006
1 parent 5193efc commit 483759dec4634dea2429a93efc3a7ee72975eaac
Showing with 26 additions and 7 deletions.
  1. +15 −0 ChangeLog
  2. +2 −2 cherokee/connection.c
  3. +1 −0 cherokee/fdpoll-kqueue.c
  4. +1 −1 cherokee/handler_cgi_base.c
  5. +2 −0 cherokee/handler_fcgi.c
  6. +1 −0 cherokee/macros.h
  7. +4 −4 cherokee/socket.h
View
@@ -1,3 +1,18 @@
+2006-11-16 Alvaro Lopez Ortega <alvaro@alobbs.com>
+
+ * cherokee/socket.h: Inclusion of arpa/inet.h has been moved after
+ the inclusion of netinet/in.h.
+
+ * cherokee/fdpoll-kqueue.c: Included sys/types.h. Needed by
+ FreeBSD.
+
+ * cherokee/macros.h: Added stdlib.h inclusion.
+
+ * cherokee/handler_cgi_base.c (parse_header),
+ cherokee/connection.c (get_range): atoll() calls have been
+ replaced by strtoll() calls. It was failing on FreeBSD because of
+ this.
+
2006-11-15 Alvaro Lopez Ortega <alvaro@alobbs.com>
* themes/default_header.html: Added "generator" meta entry.
View
@@ -1225,7 +1225,7 @@ get_range (cherokee_connection_t *conn, char *ptr, int ptr_len)
}
tmp[num_len] = '\0';
if (num_len != 0) {
- conn->range_start = atoll (tmp);
+ conn->range_start = strtoll (tmp, (char **)NULL, 10);
if (conn->range_start < 0) {
return ret_error;
}
@@ -1251,7 +1251,7 @@ get_range (cherokee_connection_t *conn, char *ptr, int ptr_len)
num_len++;
}
tmp[num_len] = '\0';
- conn->range_end = atoll (tmp);
+ conn->range_end = strtoll (tmp, (char **)NULL, 10);
if (conn->range_end < 1){
return ret_error;
}
View
@@ -27,6 +27,7 @@
#include "fdpoll-protected.h"
#include <stdio.h>
+#include <sys/types.h>
#include <sys/event.h>
#include <sys/time.h>
#include <unistd.h>
@@ -663,7 +663,7 @@ parse_header (cherokee_handler_cgi_base_t *cgi, cherokee_buffer_t *buffer)
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);
View
@@ -292,6 +292,8 @@ cherokee_handler_fcgi_new (cherokee_handler_t **hdl, void *cnt, cherokee_module_
ret_t
cherokee_handler_fcgi_free (cherokee_handler_fcgi_t *hdl)
{
+ TRACE (ENTRIES, "fcgi handler free: %p\n", hdl);
+
cherokee_socket_close (&hdl->socket);
cherokee_socket_mrproper (&hdl->socket);
View
@@ -31,6 +31,7 @@
#define CHEROKEE_MACROS_H
#include <stdio.h>
+#include <stdlib.h>
#include <stdarg.h>
#ifdef __cplusplus
View
@@ -46,14 +46,14 @@
# include <sys/un.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)
# include <gnutls/gnutls.h>
#elif defined(HAVE_OPENSSL)

0 comments on commit 483759d

Please sign in to comment.