*
* Copyright (c) 1996 Open Market, Inc.
*
- * See the file "LICENSE.TERMS" for information on usage and redistribution
+ * See the file "LICENSE" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
*/
#ifndef lint
-static const char rcsid[] = "$Id: fcgiapp.c,v 1.17 2000/11/05 17:37:56 robs Exp $";
+static const char rcsid[] = "$Id: fcgiapp.c,v 1.35 2003/06/22 00:16:43 robs Exp $";
#endif /* not lint */
-#include "fcgi_config.h"
-
-#ifdef _WIN32
-#define DLLAPI __declspec(dllexport)
-#endif
-
#include <assert.h>
#include <errno.h>
#include <fcntl.h> /* for fcntl */
#include <string.h>
#include <sys/types.h>
+#include "fcgi_config.h"
+
#ifdef HAVE_SYS_SOCKET_H
#include <sys/socket.h> /* for getpeername */
#endif
#include <unistd.h>
#endif
+#ifdef HAVE_LIMITS_H
+#include <limits.h>
+#endif
+
+#ifdef _WIN32
+#define DLLAPI __declspec(dllexport)
+#endif
+
#include "fcgimisc.h"
-#include "fcgiappmisc.h"
#include "fastcgi.h"
#include "fcgios.h"
#include "fcgiapp.h"
static char *webServerAddressList = NULL;
static FCGX_Request the_request;
+void FCGX_ShutdownPending(void)
+{
+ OS_ShutdownPending();
+}
+
static void *Malloc(size_t size)
{
void *result = malloc(size);
return newString;
}
-\f
+
/*
*----------------------------------------------------------------------
*
*/
int FCGX_GetChar(FCGX_Stream *stream)
{
- if(stream->rdNext != stream->stop)
- return *stream->rdNext++;
- if(stream->isClosed || !stream->isReader)
+ if (stream->isClosed || ! stream->isReader)
return EOF;
+
+ if (stream->rdNext != stream->stop)
+ return *stream->rdNext++;
+
stream->fillBuffProc(stream);
+ if (stream->isClosed)
+ return EOF;
+
stream->stopUnget = stream->rdNext;
- if(stream->rdNext != stream->stop)
+ if (stream->rdNext != stream->stop)
return *stream->rdNext++;
+
ASSERT(stream->isClosed); /* bug in fillBufProc if not */
return EOF;
}
-\f
+
/*
*----------------------------------------------------------------------
*
{
int m, bytesMoved;
- if(n <= 0) {
+ if (stream->isClosed || ! stream->isReader || n <= 0) {
return 0;
}
/*
if(bytesMoved == n)
return bytesMoved;
str += m;
- }
+ }
if(stream->isClosed || !stream->isReader)
return bytesMoved;
stream->fillBuffProc(stream);
+ if (stream->isClosed)
+ return bytesMoved;
+
stream->stopUnget = stream->rdNext;
}
}
-\f
+
/*
*----------------------------------------------------------------------
*
{
int c;
char *p = str;
+
n--;
while (n > 0) {
c = FCGX_GetChar(stream);
else
break;
}
- *p++ = c;
+ *p++ = (char) c;
n--;
if(c == '\n')
break;
*p = '\0';
return str;
}
-\f
+
/*
*----------------------------------------------------------------------
*
|| stream->rdNext == stream->stopUnget)
return EOF;
--(stream->rdNext);
- *stream->rdNext = c;
+ *stream->rdNext = (unsigned char) c;
return c;
}
int FCGX_HasSeenEOF(FCGX_Stream *stream) {
return (stream->isClosed) ? EOF : 0;
}
-\f
+
/*
*----------------------------------------------------------------------
*
int FCGX_PutChar(int c, FCGX_Stream *stream)
{
if(stream->wrNext != stream->stop)
- return (*stream->wrNext++ = c);
+ return (*stream->wrNext++ = (unsigned char) c);
if(stream->isClosed || stream->isReader)
return EOF;
stream->emptyBuffProc(stream, FALSE);
if(stream->wrNext != stream->stop)
- return (*stream->wrNext++ = c);
+ return (*stream->wrNext++ = (unsigned char) c);
ASSERT(stream->isClosed); /* bug in emptyBuffProc if not */
return EOF;
}
-\f
+
/*
*----------------------------------------------------------------------
*
stream->emptyBuffProc(stream, FALSE);
}
}
-\f
+
/*
*----------------------------------------------------------------------
*
{
return FCGX_PutStr(str, strlen(str), stream);
}
-\f
+
/*
*----------------------------------------------------------------------
*
int FCGX_VFPrintF(FCGX_Stream *stream, const char *format, va_list arg)
{
char *f, *fStop, *percentPtr, *p, *fmtBuffPtr, *buffPtr;
- int op, performedOp, sizeModifier, buffCount, buffLen, specifierLength;
- int fastPath, n, auxBuffLen, buffReqd, minWidth, precision, exp;
+ int op, performedOp, sizeModifier, buffCount = 0, buffLen, specifierLength;
+ int fastPath, n, auxBuffLen = 0, buffReqd, minWidth, precision, exp;
char *auxBuffPtr = NULL;
int streamCount = 0;
char fmtBuff[FMT_BUFFLEN];
unsigned unsignedArg;
unsigned long uLongArg;
unsigned short uShortArg;
- char *charPtrArg;
+ char *charPtrArg = NULL;
void *voidPtrArg;
int *intPtrArg;
long *longPtrArg;
short *shortPtrArg;
- double doubleArg;
- LONG_DOUBLE lDoubleArg;
+ double doubleArg = 0.0;
+ LONG_DOUBLE lDoubleArg = 0.0L;
fmtBuff[0] = '%';
f = (char *) format;
case 'h':
sizeModifier = op;
op = *(percentPtr + 2);
- fmtBuff[1] = sizeModifier;
- fmtBuff[2] = op;
+ fmtBuff[1] = (char) sizeModifier;
+ fmtBuff[2] = (char) op;
fmtBuff[3] = '\0';
specifierLength = 3;
break;
default:
sizeModifier = ' ';
- fmtBuff[1] = op;
+ fmtBuff[1] = (char) op;
fmtBuff[2] = '\0';
specifierLength = 2;
break;
switch(sizeModifier) {
case ' ':
doubleArg = va_arg(arg, double);
- frexp(doubleArg, &exp);
+ frexp(doubleArg, &exp);
break;
case 'L':
lDoubleArg = va_arg(arg, LONG_DOUBLE);
- frexp(lDoubleArg, &exp);
+ /* XXX Need to check for the presence of
+ * frexpl() and use it if available */
+ frexp((double) lDoubleArg, &exp);
break;
default:
goto ErrorReturn;
*longPtrArg = streamCount;
break;
case 'h':
- shortPtrArg = va_arg(arg, short *);
- *shortPtrArg = streamCount;
+ shortPtrArg = (short *) va_arg(arg, short *);
+ *shortPtrArg = (short) streamCount;
break;
default:
goto ErrorReturn;
*destPtr = dest;
*srcPtr = src;
}
-\f
+
/*
*----------------------------------------------------------------------
*
stream->emptyBuffProc(stream, FALSE);
return (stream->isClosed) ? -1 : 0;
}
-\f
+
/*
*----------------------------------------------------------------------
*
}
return (stream->FCGI_errno == 0) ? 0 : EOF;
}
-\f
+
/*
*----------------------------------------------------------------------
*
*/
if(stream->FCGI_errno == 0) {
stream->FCGI_errno = FCGI_errno;
- stream->isClosed = TRUE;
}
+
+ stream->isClosed = TRUE;
}
/*
* of the stream that are now all lumped under isClosed.
*/
}
-\f
+
/*
*======================================================================
* Parameters
char **cur; /* current item in vec; *cur == NULL */
} Params;
typedef Params *ParamsPtr;
-\f
+
/*
*----------------------------------------------------------------------
*
*result->cur = NULL;
return result;
}
-\f
+
/*
*----------------------------------------------------------------------
*
free(paramsPtr);
*paramsPtrPtr = NULL;
}
-\f
+
/*
*----------------------------------------------------------------------
*
}
*paramsPtr->cur = NULL;
}
-\f
+
/*
*----------------------------------------------------------------------
*
{
int len;
char **p;
+
+ if (name == NULL || envp == NULL) return NULL;
+
len = strlen(name);
- if(len == 0) return NULL;
- for (p = envp; *p != NULL; p++) {
+
+ for (p = envp; *p; ++p) {
if((strncmp(name, *p, len) == 0) && ((*p)[len] == '=')) {
return *p+len+1;
}
}
return NULL;
}
-\f
+
/*
*----------------------------------------------------------------------
*
*
*----------------------------------------------------------------------
*/
-\f
+
/*
*----------------------------------------------------------------------
*
}
return 0;
}
-\f
+
/*
*----------------------------------------------------------------------
*
ASSERT(contentLength >= 0 && contentLength <= FCGI_MAX_LENGTH);
ASSERT(paddingLength >= 0 && paddingLength <= 0xff);
header.version = FCGI_VERSION_1;
- header.type = type;
- header.requestIdB1 = (requestId >> 8) & 0xff;
- header.requestIdB0 = (requestId ) & 0xff;
- header.contentLengthB1 = (contentLength >> 8) & 0xff;
- header.contentLengthB0 = (contentLength ) & 0xff;
- header.paddingLength = paddingLength;
+ header.type = (unsigned char) type;
+ header.requestIdB1 = (unsigned char) ((requestId >> 8) & 0xff);
+ header.requestIdB0 = (unsigned char) ((requestId ) & 0xff);
+ header.contentLengthB1 = (unsigned char) ((contentLength >> 8) & 0xff);
+ header.contentLengthB0 = (unsigned char) ((contentLength ) & 0xff);
+ header.paddingLength = (unsigned char) paddingLength;
header.reserved = 0;
return header;
}
-\f
+
/*
*----------------------------------------------------------------------
*
int protocolStatus)
{
FCGI_EndRequestBody body;
- body.appStatusB3 = (appStatus >> 24) & 0xff;
- body.appStatusB2 = (appStatus >> 16) & 0xff;
- body.appStatusB1 = (appStatus >> 8) & 0xff;
- body.appStatusB0 = (appStatus ) & 0xff;
- body.protocolStatus = protocolStatus;
+ body.appStatusB3 = (unsigned char) ((appStatus >> 24) & 0xff);
+ body.appStatusB2 = (unsigned char) ((appStatus >> 16) & 0xff);
+ body.appStatusB1 = (unsigned char) ((appStatus >> 8) & 0xff);
+ body.appStatusB0 = (unsigned char) ((appStatus ) & 0xff);
+ body.protocolStatus = (unsigned char) protocolStatus;
memset(body.reserved, 0, sizeof(body.reserved));
return body;
}
-\f
+
/*
*----------------------------------------------------------------------
*
int type)
{
FCGI_UnknownTypeBody body;
- body.type = type;
+ body.type = (unsigned char) type;
memset(body.reserved, 0, sizeof(body.reserved));
return body;
}
-\f
+
/*
*----------------------------------------------------------------------
*
u = ((u + 7) & (ULONG_MAX - 7)) - u;
return p + u;
}
-\f
+
/*
* State associated with a stream
int rawWrite; /* writer: write data without stream headers */
FCGX_Request *reqDataPtr; /* request data not specific to one stream */
} FCGX_Stream_Data;
-\f
+
/*
*----------------------------------------------------------------------
*
}
data->reqDataPtr->nWriters--;
}
-\f
+
static int write_it_all(int fd, char *buf, int len)
stream->wrNext += sizeof(FCGI_Header);
}
}
-\f
+
/*
* Return codes for Process* functions
*/
static int ProcessManagementRecord(int type, FCGX_Stream *stream)
{
FCGX_Stream_Data *data = (FCGX_Stream_Data *)stream->data;
- ParamsPtr paramsPtr = NewParams(3);
+ ParamsPtr paramsPtr;
char **pPtr;
char response[64]; /* 64 = 8 + 3*(1+1+14+1)* + padding */
char *responseP = &response[FCGI_HEADER_LEN];
- char *name, value;
+ char *name, value = '\0';
int len, paddedLen;
if(type == FCGI_GET_VALUES) {
+ paramsPtr = NewParams(3);
ReadParams(paramsPtr, stream);
if((FCGX_GetError(stream) != 0) || (data->contentLen != 0)) {
FreeParams(¶msPtr);
return MGMT_RECORD;
}
-\f
+
/*
*----------------------------------------------------------------------
*
data->reqDataPtr->isBeginProcessed = TRUE;
return BEGIN_RECORD;
}
-\f
+
/*
*----------------------------------------------------------------------
*
}
return STREAM_RECORD;
}
-\f
+
/*
*----------------------------------------------------------------------
*
}
}
}
-\f
+
/*
*----------------------------------------------------------------------
*
}
return stream;
}
-\f
+
/*
*----------------------------------------------------------------------
*
- * FreeStream --
+ * FCGX_FreeStream --
*
* Frees all storage allocated when *streamPtr was created,
* and nulls out *streamPtr.
*
*----------------------------------------------------------------------
*/
-void FreeStream(FCGX_Stream **streamPtr)
+void FCGX_FreeStream(FCGX_Stream **streamPtr)
{
FCGX_Stream *stream = *streamPtr;
FCGX_Stream_Data *data;
free(stream);
*streamPtr = NULL;
}
-\f
+
/*
*----------------------------------------------------------------------
*
stream->isClosed = FALSE;
return stream;
}
-\f
+
/*
*----------------------------------------------------------------------
*
return NewStream(reqDataPtr, bufflen, TRUE, streamType);
}
-
/*
*----------------------------------------------------------------------
*
return NewStream(reqDataPtr, bufflen, FALSE, streamType);
}
-
/*
*----------------------------------------------------------------------
*
- * CreateWriter --
+ * FCGX_CreateWriter --
*
* Creates a stream to write streamType FastCGI records, using
* the given ipcFd and request Id. This function is provided
*
*----------------------------------------------------------------------
*/
-FCGX_Stream *CreateWriter(
+FCGX_Stream *FCGX_CreateWriter(
int ipcFd,
int requestId,
int bufflen,
reqDataPtr->nWriters = 2;
return NewWriter(reqDataPtr, bufflen, streamType);
}
-\f
+
/*
*======================================================================
* Control
return !isFastCGI;
}
-\f
+
/*
*----------------------------------------------------------------------
*
*/
void FCGX_Finish_r(FCGX_Request *reqDataPtr)
{
+ int close;
+
if (reqDataPtr == NULL) {
return;
}
+ close = !reqDataPtr->keepConnection;
+
/* 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);
+ close |= FCGX_FClose(reqDataPtr->err);
+ close |= FCGX_FClose(reqDataPtr->out);
+ close |= FCGX_GetError(reqDataPtr->in);
- if (errStatus || outStatus || FCGX_GetError(reqDataPtr->in))
- {
- OS_IpcClose(reqDataPtr->ipcFd);
- reqDataPtr->ipcFd = -1;
+ /* discard any remaining data in input stream on persistent connections */
+ if (!close && !reqDataPtr->in->isClosed && reqDataPtr->keepConnection) {
+ FCGX_Stream *stream = reqDataPtr->in;
+
+ do {
+ stream->rdNext = stream->stop;
+ stream->fillBuffProc(stream);
+ } while (!stream->isClosed);
+
+ close |= FCGX_GetError(stream);
}
}
- FCGX_Free(reqDataPtr);
+ FCGX_Free(reqDataPtr, close);
}
-void FCGX_Free(FCGX_Request * request)
+void FCGX_Free(FCGX_Request * request, int close)
{
if (request == NULL)
return;
- FreeStream(&request->in);
- FreeStream(&request->out);
- FreeStream(&request->err);
+ FCGX_FreeStream(&request->in);
+ FCGX_FreeStream(&request->out);
+ FCGX_FreeStream(&request->err);
FreeParams(&request->paramsPtr);
- if (!request->keepConnection)
- {
- OS_IpcClose(request->ipcFd);
+ if (close) {
+ OS_IpcClose(request->ipcFd, ! request->detached);
request->ipcFd = -1;
+ request->detached = 0;
}
}
/* @@@ Should validate against "known" flags */
request->flags = flags;
+ request->ipcFd = -1;
+
return 0;
}
return 0;
}
- /* If our compiler doesn't play by the ISO rules for struct layout, halt. */
- ASSERT(sizeof(FCGI_Header) == FCGI_HEADER_LEN);
-
FCGX_InitRequest(&the_request, FCGI_LISTENSOCK_FILENO, 0);
if (OS_LibInit(NULL) == -1) {
{
int rc;
- if (!libInitialized) {
- if ((rc = FCGX_Init())) {
- return (rc < 0) ? rc : -rc;
+ if (! libInitialized) {
+ rc = FCGX_Init();
+ if (rc) {
+ return rc;
}
}
* Close the connection and try again.
*/
TryAgain:
- FCGX_Free(reqDataPtr);
+ FCGX_Free(reqDataPtr, 1);
} /* for (;;) */
/*
reqDataPtr->envp = reqDataPtr->paramsPtr->vec;
return 0;
}
-\f
+
/*
*----------------------------------------------------------------------
*
SetReaderType(stream, FCGI_DATA);
return 0;
}
-\f
+
/*
*----------------------------------------------------------------------
*
data->reqDataPtr->appStatus = status;
}
+
+int
+FCGX_Attach(FCGX_Request * r)
+{
+ r->detached = FALSE;
+ return 0;
+}
+
+
+int
+FCGX_Detach(FCGX_Request * r)
+{
+ if (r->ipcFd <= 0)
+ {
+ return -1;
+ }
+
+ r->detached = TRUE;
+ return 0;
+}
projects / catagits/fcgi2.git / blobdiff