*
*/
#ifndef lint
-static const char rcsid[] = "$Id: fcgiapp.c,v 1.8 1999/08/05 21:25:53 roberts Exp $";
+static const char rcsid[] = "$Id: fcgiapp.c,v 1.16 2000/11/05 17:09:35 robs Exp $";
#endif /* not lint */
#include "fcgi_config.h"
* Globals
*/
static int libInitialized = 0;
+static int isFastCGI = -1;
static char *webServerAddressList = NULL;
-static FCGX_Request reqData;
-static FCGX_Request *reqDataPtr = &reqData;
+static FCGX_Request the_request;
static void *Malloc(size_t size)
{
percentPtr = (char *)memchr(f, '%', fStop - f);
if(percentPtr == NULL) percentPtr = fStop;
if(percentPtr != f) {
- if(FCGX_PutStr(f, percentPtr - f, stream) < 0) goto ErrorReturn;
+ if(FCGX_PutStr(f, percentPtr - f, stream) < 0)
+ goto ErrorReturn;
streamCount += percentPtr - f;
f = percentPtr;
if(f == fStop) break;
* Scan flags
*/
n = strspn(p, "-0+ #");
- if(n > 5) goto ErrorReturn;
+ if(n > 5)
+ goto ErrorReturn;
CopyAndAdvance(&fmtBuffPtr, &p, n);
/*
* Scan minimum field width
if(n == 0) {
if(*p == '*') {
minWidth = va_arg(arg, int);
- if(abs(minWidth) > 999999) goto ErrorReturn;
+ if(abs(minWidth) > 999999)
+ goto ErrorReturn;
/*
* The following use of strlen rather than the
* value returned from sprintf is because SUNOS4
if(*p == '*') {
precision = va_arg(arg, int);
if(precision < 0) precision = 0;
- if(precision > 999999) goto ErrorReturn;
+ if(precision > 999999)
+ goto ErrorReturn;
/*
* The following use of strlen rather than the
* value returned from sprintf is because SUNOS4
break;
case 's':
charPtrArg = va_arg(arg, char *);
+ if (!charPtrArg) charPtrArg = "(null)";
if(precision == -1) {
buffReqd = strlen(charPtrArg);
} else {
if(auxBuffPtr != NULL) free(auxBuffPtr);
auxBuffPtr = (char *)Malloc(buffReqd);
auxBuffLen = buffReqd;
- if(auxBuffPtr == NULL) goto ErrorReturn;
+ if(auxBuffPtr == NULL)
+ goto ErrorReturn;
}
buffPtr = auxBuffPtr;
buffLen = auxBuffLen;
buffCount = strlen(buffPtr);
break;
case 'h':
- shortArg = va_arg(arg, short);
- sprintf(buffPtr, fmtBuff, shortArg);
+ shortArg = (short) va_arg(arg, int);
+ sprintf(buffPtr, fmtBuff, shortArg);
buffCount = strlen(buffPtr);
break;
default:
buffCount = strlen(buffPtr);
break;
case 'h':
- uShortArg = va_arg(arg, unsigned short);
- sprintf(buffPtr, fmtBuff, uShortArg);
+ uShortArg = (unsigned short) va_arg(arg, int);
+ sprintf(buffPtr, fmtBuff, uShortArg);
buffCount = strlen(buffPtr);
break;
default:
}
break;
case 'p':
- if(sizeModifier != ' ') goto ErrorReturn;
+ if(sizeModifier != ' ')
+ goto ErrorReturn;
voidPtrArg = va_arg(arg, void *);
sprintf(buffPtr, fmtBuff, voidPtrArg);
buffCount = strlen(buffPtr);
break;
} /* switch(op) */
if(performedOp) break;
- if(!fastPath) goto ErrorReturn;
+ if(!fastPath)
+ goto ErrorReturn;
fastPath = FALSE;
} /* for (;;) */
ASSERT(buffCount < buffLen);
*/
int FCGX_FClose(FCGX_Stream *stream)
{
+ if (stream == NULL) return 0;
+
if(!stream->wasFCloseCalled) {
if(!stream->isReader) {
stream->emptyBuffProc(stream, TRUE);
* Results:
* TRUE if the process is a CGI process, FALSE if FastCGI.
*
- * Side effects:
- * If this is a FastCGI process there's a chance that a connection
- * will be accepted while performing the test. If this occurs,
- * the connection is saved and used later by the FCGX_Accept logic.
- *
*----------------------------------------------------------------------
*/
int FCGX_IsCGI(void)
{
- static int isFastCGI = -1;
-
if (isFastCGI != -1) {
return !isFastCGI;
}
void FCGX_Finish(void)
{
- FCGX_Finish_r(reqDataPtr);
+ FCGX_Finish_r(&the_request);
}
/*
return;
}
+ /* This should probably use a 'status' member instead of 'in' */
if (reqDataPtr->in) {
int errStatus = FCGX_FClose(reqDataPtr->err);
int outStatus = FCGX_FClose(reqDataPtr->out);
- if (errStatus || outStatus
- || FCGX_GetError(reqDataPtr->in)
- || !reqDataPtr->keepConnection)
+ if (errStatus || outStatus || FCGX_GetError(reqDataPtr->in))
{
OS_IpcClose(reqDataPtr->ipcFd);
}
+ }
- ASSERT(reqDataPtr->nWriters == 0);
+ FCGX_Free(reqDataPtr);
+}
- FreeStream(&reqDataPtr->in);
- FreeStream(&reqDataPtr->out);
- FreeStream(&reqDataPtr->err);
+void FCGX_Free(FCGX_Request * request)
+{
+ if (request == NULL)
+ return;
- FreeParams(&reqDataPtr->paramsPtr);
- }
+ FreeStream(&request->in);
+ FreeStream(&request->out);
+ FreeStream(&request->err);
+ FreeParams(&request->paramsPtr);
- if (!reqDataPtr->keepConnection) {
- reqDataPtr->ipcFd = -1;
+ if (!request->keepConnection)
+ {
+ OS_IpcClose(request->ipcFd);
+ request->ipcFd = -1;
}
}
int FCGX_OpenSocket(const char *path, int backlog)
{
- return OS_CreateLocalIpcFd(path, backlog);
+ int rc = OS_CreateLocalIpcFd(path, backlog);
+ if (rc == FCGI_LISTENSOCK_FILENO && isFastCGI == 0) {
+ /* XXX probably need to call OS_LibInit() again for Win */
+ isFastCGI = 1;
+ }
+ return rc;
}
int FCGX_InitRequest(FCGX_Request *request, int sock, int flags)
/* If our compiler doesn't play by the ISO rules for struct layout, halt. */
ASSERT(sizeof(FCGI_Header) == FCGI_HEADER_LEN);
- FCGX_InitRequest(&reqData, FCGI_LISTENSOCK_FILENO, 0);
+ FCGX_InitRequest(&the_request, FCGI_LISTENSOCK_FILENO, 0);
if (OS_LibInit(NULL) == -1) {
return OS_Errno ? OS_Errno : -9997;
}
p = getenv("FCGI_WEB_SERVER_ADDRS");
- webServerAddressList = p ? StringCopy(p) : "";
+ webServerAddressList = p ? StringCopy(p) : NULL;
libInitialized = 1;
return 0;
FCGX_Stream **err,
FCGX_ParamArray *envp)
{
+ int rc;
+
if (!libInitialized) {
- int rc = FCGX_Init();
- if (rc) {
+ if ((rc = FCGX_Init())) {
return (rc < 0) ? rc : -rc;
}
}
- return FCGX_Accept_r(&reqData);
+ rc = FCGX_Accept_r(&the_request);
+
+ *in = the_request.in;
+ *out = the_request.out;
+ *err = the_request.err;
+ *envp = the_request.envp;
+
+ return rc;
}
/*
*/
int FCGX_Accept_r(FCGX_Request *reqDataPtr)
{
- FCGX_Stream **in = &reqDataPtr->in;
- FCGX_Stream **out = &reqDataPtr->out;
- FCGX_Stream **err = &reqDataPtr->err;
- FCGX_ParamArray *envp = &reqDataPtr->envp;
-
if (!libInitialized) {
return -9998;
}
*/
break;
}
+
/*
* Close the connection and try again.
*/
- TryAgain:
- FreeParams(&reqDataPtr->paramsPtr);
- FreeStream(&reqDataPtr->in);
- OS_Close(reqDataPtr->ipcFd);
- reqDataPtr->ipcFd = -1;
+TryAgain:
+ FCGX_Free(reqDataPtr);
+
} /* for (;;) */
/*
* Build the remaining data structures representing the new
reqDataPtr->out = NewWriter(reqDataPtr, 8192, FCGI_STDOUT);
reqDataPtr->err = NewWriter(reqDataPtr, 512, FCGI_STDERR);
reqDataPtr->nWriters = 2;
- *in = reqDataPtr->in;
- *out = reqDataPtr->out;
- *err = reqDataPtr->err;
- *envp = reqDataPtr->paramsPtr->vec;
+ reqDataPtr->envp = reqDataPtr->paramsPtr->vec;
return 0;
}
\f
SetError(stream, FCGX_CALL_SEQ_ERROR);
return -1;
}
- SetReaderType(reqDataPtr->in, FCGI_DATA);
+ SetReaderType(stream, FCGI_DATA);
return 0;
}
\f
projects / catagits/fcgi2.git / blobdiff