-/*
+/*
* cgifcgi.c --
*
* CGI to FastCGI bridge
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
*/
-
#ifndef lint
-static const char rcsid[] = "$Id: cgi-fcgi.c,v 1.3 1999/07/26 04:45:52 roberts Exp $";
+static const char rcsid[] = "$Id: cgi-fcgi.c,v 1.10 1999/08/27 19:39:17 roberts Exp $";
#endif /* not lint */
-#include <stdio.h>
-#if defined HAVE_UNISTD_H || defined __linux__
-#include <unistd.h>
-#endif
-#include <fcntl.h>
+#include "fcgi_config.h"
+
#include <assert.h>
+#include <ctype.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <errno.h>
-#include <ctype.h>
+
#ifdef HAVE_NETDB_H
#include <netdb.h>
#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
+
+#ifdef _WIN32
+#include <stdlib.h>
+#else
+extern char **environ;
#endif
+
#ifdef HAVE_SYS_PARAM_H
#include <sys/param.h>
#endif
+
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+
+#if defined HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
#include "fcgimisc.h"
#include "fcgiapp.h"
#include "fcgiappmisc.h"
#include "fastcgi.h"
-#include "fcgi_config.h"
#include "fcgios.h"
+
static int wsReadPending = 0;
static int fcgiReadPending = 0;
static int fcgiWritePending = 0;
* the Web server. Used in main to prevent
* rescheduling WebServerReadHandler. */
+static void WriteStdinEof(void)
+{
+ static int stdin_eof_sent = 0;
+
+ if (stdin_eof_sent)
+ return;
+
+ *((FCGI_Header *)fromWS.stop) = MakeHeader(FCGI_STDIN, requestId, 0, 0);
+ fromWS.stop += sizeof(FCGI_Header);
+ stdin_eof_sent = 1;
+}
+
/*
*----------------------------------------------------------------------
*
bytesToRead -= bytesRead;
fromWS.stop = &fromWS.buff[sizeof(FCGI_Header) + bytesRead];
webServerReadHandlerEOF = (bytesRead == 0);
+
+ if (bytesToRead <= 0)
+ WriteStdinEof();
+
ScheduleIo();
}
\f
}
ScheduleIo();
-}
+}
\f
/*
*
* Side effects:
* This routine will signal the ioEvent upon completion.
- *
+ *
*/
static void ScheduleIo(void)
{
if(!fcgiReadPending && appServerSock != -1) {
fromAS.next = &fromAS.buff[0];
- if(OS_AsyncRead(appServerSock, 0, fromAS.next, BUFFLEN,
+ if(OS_AsyncRead(appServerSock, 0, fromAS.next, BUFFLEN,
AppServerReadHandler,
(ClientData)appServerSock) == -1) {
FCGIexit(OS_Errno);
!fcgiWritePending &&
fromWS.next == &fromWS.buff[0]) {
if(OS_AsyncReadStdin(fromWS.next + sizeof(FCGI_Header),
- BUFFLEN - sizeof(FCGI_Header),
+ BUFFLEN - sizeof(FCGI_Header),
WebServerReadHandler, STDIN_FILENO)== -1) {
FCGIexit(OS_Errno);
} else {
{
int listenFd, i;
- if((listenFd = OS_CreateLocalIpcFd(bindPath)) == -1) {
+ /* @@@ Should be able to pick up the backlog as an arg */
+ if((listenFd = OS_CreateLocalIpcFd(bindPath, 5)) == -1) {
exit(OS_Errno);
}
-
+
if(access(appPath, X_OK) == -1) {
fprintf(stderr, "%s is not executable\n", appPath);
exit(1);
unsigned char *startHeaderBuffPtr = headerBuffPtr;
ASSERT(nameLen >= 0);
- if (nameLen < 0x80 == 0) {
+ if (nameLen < 0x80) {
*headerBuffPtr++ = nameLen;
} else {
*headerBuffPtr++ = (nameLen >> 24) | 0x80;
*headerBuffPtr++ = nameLen;
}
ASSERT(valueLen >= 0);
- if (valueLen < 0x80 == 0) {
+ if (valueLen < 0x80) {
*headerBuffPtr++ = valueLen;
} else {
*headerBuffPtr++ = (valueLen >> 24) | 0x80;
"%d is max from a file\n", MAXARGS);
exit(-1);
}
- if((av[ac] = malloc(strlen(tp1)+1)) == NULL) {
+ if((av[ac] = (char *)malloc(strlen(tp1)+1)) == NULL) {
fprintf(stderr, "Cannot allocate %d bytes\n",
strlen(tp1)+1);
exit(-1);
}
} else if(*appPathPtr == '\0') {
strcpy(appPathPtr, argv[i]);
- } else if(isdigit(argv[i][0]) && *nServersPtr == 0) {
+ } else if(isdigit((int)argv[i][0]) && *nServersPtr == 0) {
*nServersPtr = atoi(argv[i]);
if(*nServersPtr <= 0) {
fprintf(stderr, "Number of servers must be greater than 0\n");
This hack lets me test the ability to create a local process listening
to a TCP/IP port for connections and subsequently connect to the app
like we do for Unix domain and named pipes.
-
+
if(*doStartPtr && *doBindPtr) {
fprintf(stderr,
"<connName> of form hostName:portNumber "
return err;
}
\f
-int main(int argc, char **argv, char **envp)
+int main(int argc, char **argv)
{
+ char **envp = environ;
int count;
FCGX_Stream *paramsStream;
int numFDs;
} else {
bytesToRead = 0;
}
-
+
if(doBind) {
appServerSock = OS_FcgiConnect(bindPath);
}
numFDs = max(appServerSock, STDIN_FILENO) + 1;
OS_SetFlags(appServerSock, O_NONBLOCK);
+ if (bytesToRead <= 0)
+ WriteStdinEof();
+
ScheduleIo();
+
while(!exitStatusSet) {
/*
* NULL = wait forever (or at least until there's something
FCGIexit(999);
}
- exit(0);
+ return 0;
}