gnustep/libs-gsweb
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gsweb.git synced 2025-02-21 02:41:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

* GSWAdaptors/Apache/mod_gsweb.c

Browse source 
* GSWAdaptors/common/GNUmakefile
        * GSWAdaptors/common/GSWConfig.[h|c]
        * GSWAdaptors/common/GSWLock.h
        * GSWAdaptors/common/GSWStats.c
        * GSWAdaptors/common/GSWUtil.[h|c]
        * GSWAdaptors/common/config.h
          remove #ifdefs of Netscape, Apache and Apache2, only
          leave parts of Apache


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@36712 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Sebastian Reitenbach 2013-06-09 08:14:21 +00:00
parent ae7a86c834
commit fe3b9ce17c
10 changed files with 18 additions and 219 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ChangeLog
View file

@ -1,3 +1,14 @@
2013-06-09: Sebastian Reitenbach <sebastia@l00-bugdead-prods.de>
* GSWAdaptors/Apache/mod_gsweb.c
* GSWAdaptors/common/GNUmakefile
* GSWAdaptors/common/GSWConfig.[h|c]
* GSWAdaptors/common/GSWLock.h
* GSWAdaptors/common/GSWStats.c
* GSWAdaptors/common/GSWUtil.[h|c]
* GSWAdaptors/common/config.h
remove #ifdefs of Netscape, Apache and Apache2, only
leave parts of Apache
2013-06-06: Sebastian Reitenbach <sebastia@l00-bugdead-prods.de> 2013-06-06: Sebastian Reitenbach <sebastia@l00-bugdead-prods.de>
* GSWAdaptors/common/GSWAppConnectSocket.c * GSWAdaptors/common/GSWAppConnectSocket.c
* GSWAdaptors/common/GSWUtil.c * GSWAdaptors/common/GSWUtil.c
@ -9,7 +20,6 @@
note about Apache adaptor to work with OpenBSD Apache note about Apache adaptor to work with OpenBSD Apache
delete GSWAdaptors/netscape delete GSWAdaptors/netscape
2013-06-02: David Wetzel <dave@turbocat.de> 2013-06-02: David Wetzel <dave@turbocat.de>
* GSWeb/GSWMessage.m * GSWeb/GSWMessage.m
Remove warning Remove warning

2
GSWAdaptors/Apache/mod_gsweb.c
View file

@ -525,7 +525,7 @@ GSWeb_Handler(request_rec *p_pRequestRec)
memset(&stStats,0,sizeof(stStats)); memset(&stStats,0,sizeof(stStats));
// The request time stamp // The request time stamp
stStats._requestTS=GSWTime_makeFromAPRTime(p_pRequestRec->request_time); stStats._requestTS=(GSWTime)(p_pRequestRec->request_time);
// Handling start time stamp // Handling start time stamp
stStats._beginHandleRequestTS=GSWTime_now(); stStats._beginHandleRequestTS=GSWTime_now();

7
GSWAdaptors/common/GNUmakefile
View file

@ -1,5 +1,3 @@
#Defaults #Defaults
#Directories #Directories
@ -18,12 +16,7 @@ ADAPTORLIB = $(OBJROOT)/libAdaptor.a
COMMON = $(SRCROOT)/common COMMON = $(SRCROOT)/common
INCLUDE = -I$(COMMON) INCLUDE = -I$(COMMON)
ifeq "solaris" "$(PLATFORM_OS)"
CFLAGS = -O2 $(RC_CFLAGS) $(INCLUDE) -DCGI -DSOLARIS -DNEEDS_HSTRERR
else
CFLAGS = -O2 $(RC_CFLAGS) $(INCLUDE) -DCGI CFLAGS = -O2 $(RC_CFLAGS) $(INCLUDE) -DCGI
endif
all:: $(ADAPTORLIB) all:: $(ADAPTORLIB)

20
GSWAdaptors/common/GSWConfig.c
View file

@ -62,39 +62,19 @@ const char *g_szGSWeb_MimeType=GSWEB__MIME_TYPE;
//const char *g_szGSWeb_Conf_DocRoot=GSWEB_CONF__DOC_ROOT; //const char *g_szGSWeb_Conf_DocRoot=GSWEB_CONF__DOC_ROOT;
const char *g_szGSWeb_Conf_ConfigFilePath=GSWEB_CONF__CONFIG_FILE_PATH; const char *g_szGSWeb_Conf_ConfigFilePath=GSWEB_CONF__CONFIG_FILE_PATH;
// Apache
#if defined(Apache)
const char *g_szGSWeb_Conf_Alias=GSWEB_CONF__ALIAS; const char *g_szGSWeb_Conf_Alias=GSWEB_CONF__ALIAS;
#endif
// Netscape
#if defined(Netscape)
const char *g_szGSWeb_Conf_PathTrans=GSWEB_CONF__PATH_TRANS;
const char *g_szGSWeb_Conf_AppRoot=GSWEB_CONF__APP_ROOT;
const char *g_szGSWeb_Conf_Name=GSWEB_CONF__NAME;
#endif
const char *g_szGSWeb_InstanceCookie[2]={ GSWEB_INSTANCE_COOKIE_GSW, GSWEB_INSTANCE_COOKIE_WO }; const char *g_szGSWeb_InstanceCookie[2]={ GSWEB_INSTANCE_COOKIE_GSW, GSWEB_INSTANCE_COOKIE_WO };
const char *g_szGSWeb_Server=SERVER; const char *g_szGSWeb_Server=SERVER;
const char *g_szGSWeb_ServerAndAdaptorVersion=SERVER "/" GSWEB_SERVER_ADAPTOR_VERSION_MAJOR_STRING "." GSWEB_SERVER_ADAPTOR_VERSION_MINOR_STRING; const char *g_szGSWeb_ServerAndAdaptorVersion=SERVER "/" GSWEB_SERVER_ADAPTOR_VERSION_MAJOR_STRING "." GSWEB_SERVER_ADAPTOR_VERSION_MINOR_STRING;
const char *const g_szGNUstep = "GNUstep"; const char *const g_szGNUstep = "GNUstep";
const char *const g_szOKGSWeb[2] = { "OK GSWeb", "OK Apple"}; const char *const g_szOKGSWeb[2] = { "OK GSWeb", "OK Apple"};
const char *const g_szOKStatus[2] = { "HTTP/1.0 200 OK GNUstep GSWeb", "HTTP/1.0 200 OK Apple GSWeb"}; const char *const g_szOKStatus[2] = { "HTTP/1.0 200 OK GNUstep GSWeb", "HTTP/1.0 200 OK Apple GSWeb"};
#if defined(Apache)
#define GSWServerVersion ap_get_server_version() #define GSWServerVersion ap_get_server_version()
#define GSWServerBuilt ap_get_server_built() #define GSWServerBuilt ap_get_server_built()
#define GSWServerURL "http://www.apache.org" #define GSWServerURL "http://www.apache.org"
#else
#define GSWServerVersion "Unknown"
#define GSWServerBuilt "Unknown"
#define GSWServerURL "http://www.gnustepweb.org"
#endif
//==================================================================== //====================================================================
GSWLock g_lockAppList=NULL; GSWLock g_lockAppList=NULL;

11
GSWAdaptors/common/GSWConfig.h
View file

@ -53,18 +53,7 @@ extern const char *g_szGSWeb_MimeType;
//extern const char *g_szGSWeb_Conf_DocRoot; //extern const char *g_szGSWeb_Conf_DocRoot;
extern const char *g_szGSWeb_Conf_ConfigFilePath; extern const char *g_szGSWeb_Conf_ConfigFilePath;
// Apache
#if defined(Apache)
extern const char *g_szGSWeb_Conf_Alias; extern const char *g_szGSWeb_Conf_Alias;
#endif
// Netscape
#if defined(Netscape)
extern const char *g_szGSWeb_Conf_PathTrans;
extern const char *g_szGSWeb_Conf_AppRoot;
extern const char *g_szGSWeb_Conf_Name;
#endif
extern const char *g_szGSWeb_InstanceCookie[2]; extern const char *g_szGSWeb_InstanceCookie[2];

26
GSWAdaptors/common/GSWLock.h
View file

@ -31,26 +31,12 @@ extern "C" {
// Apache has no theading for old versions // Apache has no theading for old versions
#if !defined(REENTRANT) || defined(Apache) #define GSWLock void*
#define GSWLock void* #define GSWLock_Init(TheLock)
#define GSWLock_Init(TheLock) #define GSWLock_Lock(TheLock)
#define GSWLock_Lock(TheLock) #define GSWLock_Unlock(TheLock)
#define GSWLock_Unlock(TheLock) #define GSWLock_Free(TheLock)
#define GSWLock_Free(TheLock) #define GSWLock_Sleep(SecNb) sleep(SecNb)
#define GSWLock_Sleep(SecNb) sleep(SecNb)
#elif defined(Netscape)
#include <base/systems.h>
#include <base/crit.h>
#include <base/systhr.h>
#define GSWLock CRITICAL
#define GSWLock_Init(TheLock) (TheLock = crit_init())
#define GSWLock_Lock(TheLock) crit_enter(TheLock)
#define GSWLock_Unlock(TheLock) crit_exit(TheLock)
#define GSWLock_Free(TheLock) crit_terminate(TheLock)
#define GSWLock_Sleep(SecNb) systhread_sleep(SecNb*1000)
#else
#error "GSWLock.h Unknwon server"
#endif
#ifdef __cplusplus #ifdef __cplusplus
} }

4
GSWAdaptors/common/GSWStats.c
View file

@ -38,12 +38,8 @@
#include "config.h" #include "config.h"
#include "GSWLock.h" #include "GSWLock.h"
#if defined(Netscape)
#include <frame/log.h>
#elif defined(Apache)
#include <httpd.h> #include <httpd.h>
#include <http_log.h> #include <http_log.h>
#endif
#include "config.h" #include "config.h"
#include "GSWUtil.h" #include "GSWUtil.h"

97
GSWAdaptors/common/GSWUtil.c
View file

@ -38,12 +38,8 @@
#include "config.h" #include "config.h"
#include "GSWLock.h" #include "GSWLock.h"
#if defined(Netscape)
#include <frame/log.h>
#elif defined(Apache)
#include <httpd.h> #include <httpd.h>
#include <http_log.h> #include <http_log.h>
#endif
#include "config.h" #include "config.h"
#include "GSWUtil.h" #include "GSWUtil.h"
@ -136,11 +132,7 @@ VGSWLogSizedIntern(char *file,
int line, int line,
char *fn, char *fn,
int p_iLevel, int p_iLevel,
#if defined(Apache)
server_rec *p_pLogServerData, server_rec *p_pLogServerData,
#else
void *p_pLogServerData,
#endif
int p_iBufferSize, int p_iBufferSize,
CONST char *p_pszFormat, CONST char *p_pszFormat,
va_list ap) va_list ap)
@ -156,21 +148,9 @@ VGSWLogSizedIntern(char *file,
vsnprintf(szBuffer, p_iBufferSize+511, p_pszFormat, ap); vsnprintf(szBuffer, p_iBufferSize+511, p_pszFormat, ap);
szBuffer[p_iBufferSize+511] = 0; szBuffer[p_iBufferSize+511] = 0;
#if defined(Netscape)
log_error(0,"GSWeb: ",NULL,NULL,szBuffer);
#endif
#if defined(Apache)
#if defined(Apache2)
ap_log_error(file,line,p_iLevel,0,
(server_rec *)p_pLogServerData,
"GSWeb[%lu]: %s",(unsigned long)getpid(),szBuffer);
#else
ap_log_error(file,line,p_iLevel, ap_log_error(file,line,p_iLevel,
(server_rec *)p_pLogServerData, (server_rec *)p_pLogServerData,
"GSWeb[%lu]: %s",(unsigned long)getpid(),szBuffer); "GSWeb[%lu]: %s",(unsigned long)getpid(),szBuffer);
#endif
#endif
}; };
} }
@ -180,11 +160,7 @@ GSWLog(
char *file, char *file,
int line, int line,
int p_iLevel, int p_iLevel,
#if defined(Apache)
server_rec *p_pLogServerData, server_rec *p_pLogServerData,
#else
void *p_pLogServerData,
#endif
CONST char *p_pszFormat, ...) CONST char *p_pszFormat, ...)
{ {
va_list ap; va_list ap;
@ -204,11 +180,7 @@ GSWLog(
//-------------------------------------------------------------------- //--------------------------------------------------------------------
void void
GSWLogSized(int p_iLevel, GSWLogSized(int p_iLevel,
#if defined(Apache)
server_rec *p_pLogServerData, server_rec *p_pLogServerData,
#else
void *p_pLogServerData,
#endif
int p_iBufferSize, int p_iBufferSize,
CONST char *p_pszFormat, ...) CONST char *p_pszFormat, ...)
{ {
@ -231,11 +203,7 @@ GSWLogIntern(char *file,
int line, int line,
char *fn, char *fn,
int p_iLevel, int p_iLevel,
#if defined(Apache)
server_rec *p_pLogServerData, server_rec *p_pLogServerData,
#else
void *p_pLogServerData,
#endif
CONST char *p_pszFormat,...) CONST char *p_pszFormat,...)
{ {
va_list ap; va_list ap;
@ -257,11 +225,7 @@ GSWLogSizedIntern(char *file,
int line, int line,
char *fn, char *fn,
int p_iLevel, int p_iLevel,
#if defined(Apache)
server_rec *p_pLogServerData, server_rec *p_pLogServerData,
#else
void *p_pLogServerData,
#endif
int p_iBufferSize, int p_iBufferSize,
CONST char *p_pszFormat,...) CONST char *p_pszFormat,...)
{ {
@ -369,10 +333,6 @@ strcasestr(CONST char *p_pszString,CONST char *p_pszSearchedString)
return NULL; return NULL;
}; };
#if defined(HAS_REENTRANT_GETHOSTENT) && !defined(_REENTRANT)
#define _REENTRANT /* needs to be defined so proper structs get included */
#endif
//-------------------------------------------------------------------- //--------------------------------------------------------------------
void void
GSWUtil_ClearHostCache() GSWUtil_ClearHostCache()
@ -414,11 +374,6 @@ GSWUtil_FindHost(CONST char *p_pszHost,
#define BUFLEN 4096 #define BUFLEN 4096
#if defined(NEEDS_HSTRERR)
#ifndef NETDB_SUCCESS
#define NETDB_SUCCESS 0
#endif
//-------------------------------------------------------------------- //--------------------------------------------------------------------
CONST char * CONST char *
hstrerror(int herr) hstrerror(int herr)
@ -440,7 +395,6 @@ hstrerror(int herr)
else else
return "unknown error"; return "unknown error";
} }
#endif
//-------------------------------------------------------------------- //--------------------------------------------------------------------
static PSTHostent static PSTHostent
@ -488,62 +442,12 @@ GSWUtil_HostLookup(CONST char *p_pszHost,
struct hostent stTmpHost; struct hostent stTmpHost;
int error=0; int error=0;
#if defined(HAS_REENTRANT_GETHOSTENT)
char szBuffer[BUFLEN];
pHost = &stTmpHost; /* point to struct on the stack */
memset(pHost,0,sizeof(struct hostent));
memset(szBuffer,0,sizeof(szBuffer));
#endif
if (!p_pszHost) if (!p_pszHost)
p_pszHost="localhost"; p_pszHost="localhost";
if (isdigit(*p_pszHost)) if (isdigit(*p_pszHost))
hostaddr.s_addr=inet_addr(p_pszHost); hostaddr.s_addr=inet_addr(p_pszHost);
#if defined(HAS_REENTRANT_GETHOSTENT)
if (isdigit(*p_pszHost))
{
#if defined(SOLARIS)
pHost = gethostbyaddr_r((char *)&hostaddr.s_addr,
sizeof(hostaddr.s_addr),
AF_INET,
pHost,
szBuffer,
BUFLEN, &error);
#else // !SOLARIS
if (gethostbyaddr_r((char *)&hostaddr.s_addr,
sizeof(hostaddr.s_addr),
AF_INET,
&stTmpHost,
szBuffer) == 0)
{
pHost = &stTmpHost;
error = 0;
}
else
{
pHost=NULL;
error = h_errno;
};
#endif // SOLARIS
}
else
{
#if defined(SOLARIS)
pHost = gethostbyname_r(p_pszHost,
&stTmpHost,
szBuffer,
BUFLEN,
&error);
#else // !SOLARIS
pHost = (gethostbyname_r(p_pszHost,&stTmpHost,szBuffer)==0) ?
&stTmpHost : NULL;
error = (pHost) ? 0 : h_errno;
#endif // SOLARIS
};
#else // !HAS_REENTRANT_GETHOSTENT
pHost = &stTmpHost; pHost = &stTmpHost;
if (isdigit(*p_pszHost)) if (isdigit(*p_pszHost))
{ {
@ -557,7 +461,6 @@ GSWUtil_HostLookup(CONST char *p_pszHost,
pHost = gethostbyname(p_pszHost); pHost = gethostbyname(p_pszHost);
error = (pHost) ? 0 : h_errno; error = (pHost) ? 0 : h_errno;
} }
#endif // HAS_REENTRANT_GETHOSTENT
if (!pHost) if (!pHost)
{ {

29
GSWAdaptors/common/GSWUtil.h
View file

@ -37,7 +37,6 @@
extern "C" { extern "C" {
#endif #endif
#if defined(Apache)
#include "httpd.h" #include "httpd.h"
#include "http_log.h" #include "http_log.h"
//#define APLOG_EMERG LOG_EMERG /* system is unusable */ //#define APLOG_EMERG LOG_EMERG /* system is unusable */
@ -48,14 +47,6 @@ extern "C" {
//#define APLOG_NOTICE LOG_NOTICE /* normal but significant condition */ //#define APLOG_NOTICE LOG_NOTICE /* normal but significant condition */
#define GSW_INFO APLOG_INFO /* informational */ #define GSW_INFO APLOG_INFO /* informational */
#define GSW_DEBUG APLOG_DEBUG /* debug-level messages */ #define GSW_DEBUG APLOG_DEBUG /* debug-level messages */
#else
#define GSW_DEBUG 0
#define GSW_INFO 1
#define GSW_WARNING 2
#define GSW_ERROR 3
#define GSW_CRITICAL 4
#endif
#define max(x, y) ((x) > (y) ? (x) : (y)) #define max(x, y) ((x) > (y) ? (x) : (y))
#define min(x, y) ((x) < (y) ? (x) : (y)) #define min(x, y) ((x) < (y) ? (x) : (y))
@ -76,10 +67,6 @@ long GSWTime_msecPart(GSWTime t);
#define GSWTime_floatSec(t) ((double)(((double)GSWTime_secPart(t))+((double)GSWTime_usecPart(t))/USEC_PER_SEC)) #define GSWTime_floatSec(t) ((double)(((double)GSWTime_secPart(t))+((double)GSWTime_usecPart(t))/USEC_PER_SEC))
#ifdef Apache
#define GSWTime_makeFromAPRTime(aprtime) ((GSWTime)(aprtime))
#endif
//==================================================================== //====================================================================
// Asserts // Asserts
#define GSWAssert(condition,p_pLogServerData,p_pszFormat, args...); \ #define GSWAssert(condition,p_pLogServerData,p_pszFormat, args...); \
@ -97,11 +84,7 @@ long GSWTime_msecPart(GSWTime t);
void GSWLog( char *file, void GSWLog( char *file,
int line, int line,
int p_iLevel, int p_iLevel,
#if defined(Apache)
server_rec *p_pLogServerData, server_rec *p_pLogServerData,
#else
void *p_pLogServerData,
#endif
CONST char *p_pszFormat, ...); CONST char *p_pszFormat, ...);
#define GSWDebugLog(p_pLogServerData,p_pszFormat, args...); \ #define GSWDebugLog(p_pLogServerData,p_pszFormat, args...); \
@ -110,11 +93,7 @@ int p_iLevel,
{ if ((condition)) GSWLog(__FILE__, __LINE__,GSW_DEBUG,p_pLogServerData,p_pszFormat, ## args);}; { if ((condition)) GSWLog(__FILE__, __LINE__,GSW_DEBUG,p_pLogServerData,p_pszFormat, ## args);};
void GSWLogSized(int p_iLevel, void GSWLogSized(int p_iLevel,
#if defined(Apache)
server_rec *p_pLogServerData, server_rec *p_pLogServerData,
#else
void *p_pLogServerData,
#endif
int p_iBufferSize, int p_iBufferSize,
CONST char *p_pszFormat, ...); CONST char *p_pszFormat, ...);
@ -122,11 +101,7 @@ void GSWLogIntern(char *file,
int line, int line,
char *fn, char *fn,
int p_iLevel, int p_iLevel,
#if defined(Apache)
server_rec *p_pLogServerData, server_rec *p_pLogServerData,
#else
void *p_pLogServerData,
#endif
CONST char *p_pszFormat, ...); CONST char *p_pszFormat, ...);
@ -134,11 +109,7 @@ void GSWLogSizedIntern(char *file,
int line, int line,
char *fn, char *fn,
int p_iLevel, int p_iLevel,
#if defined(Apache)
server_rec *p_pLogServerData, server_rec *p_pLogServerData,
#else
void *p_pLogServerData,
#endif
int p_iBufferSize, int p_iBufferSize,
CONST char *p_pszFormat, ...); CONST char *p_pszFormat, ...);

29
GSWAdaptors/common/config.h
View file

@ -30,10 +30,6 @@
extern "C" { extern "C" {
#endif //_cplusplus #endif //_cplusplus
#if defined(Apache2)
#define Apache
#endif
#define CONST const #define CONST const
#define DEBUG #define DEBUG
@ -80,37 +76,12 @@ extern "C" {
//#define GSWEB_CONF__DOC_ROOT "GSWeb_DocumentRoot" //#define GSWEB_CONF__DOC_ROOT "GSWeb_DocumentRoot"
#define GSWEB_CONF__CONFIG_FILE_PATH "GSWeb_ConfigFilePath" #define GSWEB_CONF__CONFIG_FILE_PATH "GSWeb_ConfigFilePath"
// Aapche
#if defined(Apache)
#define GSWEB_CONF__ALIAS "GSWeb_Alias" #define GSWEB_CONF__ALIAS "GSWeb_Alias"
#endif
// Netscape
#if defined(Netscape)
#define GSWEB_CONF__PATH_TRANS "from" // NameTrans
#define GSWEB_CONF__APP_ROOT "dir" // NameTrans
#define GSWEB_CONF__NAME "name" // NameTrans, Object
#endif
#define GSWEB_INSTANCE_COOKIE_WO "woinst=" #define GSWEB_INSTANCE_COOKIE_WO "woinst="
#define GSWEB_INSTANCE_COOKIE_GSW "gswinst=" #define GSWEB_INSTANCE_COOKIE_GSW "gswinst="
/*
* operating specific things regarding gethostbyname()
*/
#if defined(SOLARIS)
#define HAS_REENTRANT_GETHOSTENT
#if defined(NSAPI) || defined(Apache)
#define NEEDS_HSTRERR
#endif
#endif
#if defined(Apache)
#define SERVER "Apache" #define SERVER "Apache"
#elif defined(Netscape)
#define SERVER "NSAPI"
#endif
#ifndef MAXHOSTNAMELEN #ifndef MAXHOSTNAMELEN
#define MAXHOSTNAMELEN 256 #define MAXHOSTNAMELEN 256