Changeset 467

Timestamp:

11/21/06 00:03:17 (2 years ago)

Author:

alo

Message:

--

Files:

• cherokee/trunk/ChangeLog (modified) (1 diff)
• cherokee/trunk/cherokee/fcgi_manager.c (modified) (1 diff)
• cherokee/trunk/cherokee/handler_fcgi.c (modified) (4 diffs)
• cherokee/trunk/cherokee/handler_scgi.c (modified) (1 diff)
• cherokee/trunk/configure.in (modified) (1 diff)

cherokee/trunk/ChangeLog

@@ +1 @@
+2006-11-20  Alvaro Lopez Ortega  <alvaro@alobbs.com>
+
+        * cherokee/handler_scgi.c (connect_to_server),
+        cherokee/fcgi_manager.c (reconnect), cherokee/handler_fcgi.c
+        (connect_to_server): Socket connecting the server with the
+        application server must be turned non-blocking right after being
+        accepted. Fixed.
+
-2006-11-16  Alvaro Lopez Ortega  <alvaro@alobbs.com>
-

cherokee/trunk/cherokee/fcgi_manager.c

@@ -190 +190 @@
-
-        TRACE (ENTRIES, "Connected sucessfully try=%d, fd=%d\n", try, mgr->socket.socket);
+
+        cherokee_fd_set_nonblocking (SOCKET_FD(&mgr->socket));
-        return ret_ok;
-}

cherokee/trunk/cherokee/handler_fcgi.c

@@ -166 +166 @@
-        size_t                   read = 0;
-        cherokee_handler_fcgi_t *fcgi = HDL_FCGI(cgi);
-
+
-        ret = cherokee_socket_read (&fcgi->socket, &fcgi->write_buffer, DEFAULT_READ_SIZE, &read);
-
@@ -280 +280 @@
-        
-        cherokee_socket_init (&n->socket);
+        cherokee_socket_set_nodelay (&n->socket);
+
-        cherokee_buffer_init (&n->write_buffer);
-        cherokee_buffer_ensure_size (&n->write_buffer, 512);
@@ -521 +523 @@
-
-        TRACE (ENTRIES, "Connected sucessfully try=%d, fd=%d\n", try, hdl->socket.socket);
+
+        cherokee_fd_set_nonblocking (SOCKET_FD(&hdl->socket));
-        return ret_ok;
-}
@@ -533 +537 @@
-        
-        ret = cherokee_socket_write (&hdl->socket, buffer, &written);
-
+
+
+
+
+
+
+
+
+
+
-                conn->error_code = http_bad_gateway;
-
+_error
-        }
-        

cherokee/trunk/cherokee/handler_scgi.c

@@ -279 +279 @@
-        
-        TRACE (ENTRIES, "connected fd=%d\n", hdl->socket.socket); 
+
+        cherokee_fd_set_nonblocking (SOCKET_FD(&hdl->socket));
-        return ret_ok; 
-}

cherokee/trunk/configure.in

@@ -26 +26 @@
-m4_define([cherokee_minor_version], [6])
-m4_define([cherokee_micro_version], [0])
-42
+66
-m4_define([cherokee_version], m4_format('%s.%s.%s%s', cherokee_major_version, cherokee_minor_version, cherokee_micro_version, cherokee_patch_version))
-