alo at alobbs
Mar 28, 2006, 7:20 AM
Post #1 of 1
(100 views)
Permalink
|
|
r235 - in cherokee: . cherokee
|
|
Author: alo
Date: 2006-03-28 16:20:52 +0200 (Tue, 28 Mar 2006)
New Revision: 235
Modified:
cherokee/ChangeLog
cherokee/cherokee/ext_source.c
Log:
Modified: cherokee/ChangeLog
===================================================================
--- cherokee/ChangeLog 2006-03-28 08:55:04 UTC (rev 234)
+++ cherokee/ChangeLog 2006-03-28 14:20:52 UTC (rev 235)
@@ -1,5 +1,9 @@
2006-03-28 Alvaro Lopez Ortega <alvaro at alobbs.com>
+ * cherokee/ext_source.c (cherokee_ext_source_spawn_srv): Cleaned
+ up. olivier-ml1 at oleastre.be reported problems compiling on Win32
+ because of a bunch of includes I forgot after some tests.
+
* cherokee/buffer.c (cherokee_buffer_print_debug): Improved by
olivier-ml1 at oleastre.be.
Modified: cherokee/cherokee/ext_source.c
===================================================================
--- cherokee/cherokee/ext_source.c 2006-03-28 08:55:04 UTC (rev 234)
+++ cherokee/cherokee/ext_source.c 2006-03-28 14:20:52 UTC (rev 235)
@@ -25,6 +25,7 @@
#include "common-internal.h"
#include "ext_source.h"
#include "util.h"
+#include "socket.h"
#include <sys/types.h>
#include <unistd.h>
@@ -221,12 +222,6 @@
return ret_ok;
}
-//
-#include <sys/types.h>
-#include <sys/socket.h>
-#include "fastcgi.h"
-#include "socket.h"
-//
ret_t
cherokee_ext_source_spawn_srv (cherokee_ext_source_t *server)
@@ -238,14 +233,10 @@
char *empty_envp[] = {NULL};
cherokee_buffer_t tmp = CHEROKEE_BUF_INIT;
+#if 0
int s;
cherokee_sockaddr_t addr;
- /* Maybe set a custom enviroment variable set
- */
- envp = (server->custom_env) ? server->custom_env : empty_envp;
-
-#if 0
/* This code is meant to, in some way, signal the FastCGI that
* it is centainly a FastCGI. The fcgi client will execute
* getpeername (FCGI_LISTENSOCK_FILENO) and, then if it is a
@@ -266,6 +257,10 @@
if (re == -1) return ret_error;
#endif
+ /* Maybe set a custom enviroment variable set
+ */
+ envp = (server->custom_env) ? server->custom_env : empty_envp;
+
/* Execute the FastCGI server
*/
cherokee_buffer_add_va (&tmp, "exec %s", server->interpreter.buf);
|
