mirror of
https://github.com/gnustep/libs-gsweb.git
synced 2025-04-24 16:02:04 +00:00
* GSWAdaptors/Apache/mod_gsweb.c: Add defines to support Apache 2.2.
* GSWAdaptors/common/GSWLoadBalancing.c (GSWLoadBalancing_FindInstance): Remove unsused variable. * GSWAdaptors/common/GSWStats.c (GSWStats_formatStats): Ditto. * GSWAdaptors/common/GSWURLUtil.c (GSWParseURL): Ditto. * GSWAdaptors/common/GSWHTTPResponse.c: Include netdb.h. * GSWAdaptors/common/GSWApp.c: Include time.h. (GSWAppInfo_MakeDictKeyName): Add parentheses to avoid compiler warning. * GSWAdaptors/common/GSWAppRequest.c (GSWAppRequest_SendAppRequestToApp): Add missing CONST declaration. * GSWAdaptors/common/GSWAppConnectSocket.c: Include unistd.h * GSWAdaptors/common/GSWConfig.c: Ditto. * GSWAdaptors/common/GSWConfig.h (g_pAppDict, config_mtime): Remove unused declarations. (GSWConfig_LoadConfiguration): Add missing declaration. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@24201 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
f62af1ca72
commit
2f2a13fc47
11 changed files with 49 additions and 9 deletions
21
ChangeLog
21
ChangeLog
|
@ -1,3 +1,23 @@
|
|||
2006-12-12 David Ayers <ayers@fsfe.org>
|
||||
|
||||
* GSWAdaptors/Apache/mod_gsweb.c: Add defines to support Apache 2.2.
|
||||
|
||||
* GSWAdaptors/common/GSWLoadBalancing.c
|
||||
(GSWLoadBalancing_FindInstance): Remove unsused variable.
|
||||
* GSWAdaptors/common/GSWStats.c (GSWStats_formatStats): Ditto.
|
||||
* GSWAdaptors/common/GSWURLUtil.c (GSWParseURL): Ditto.
|
||||
* GSWAdaptors/common/GSWHTTPResponse.c: Include netdb.h.
|
||||
* GSWAdaptors/common/GSWApp.c: Include time.h.
|
||||
(GSWAppInfo_MakeDictKeyName): Add parentheses to avoid compiler
|
||||
warning.
|
||||
* GSWAdaptors/common/GSWAppRequest.c
|
||||
(GSWAppRequest_SendAppRequestToApp): Add missing CONST declaration.
|
||||
* GSWAdaptors/common/GSWAppConnectSocket.c: Include unistd.h
|
||||
* GSWAdaptors/common/GSWConfig.c: Ditto.
|
||||
* GSWAdaptors/common/GSWConfig.h (g_pAppDict, config_mtime):
|
||||
Remove unused declarations.
|
||||
(GSWConfig_LoadConfiguration): Add missing declaration.
|
||||
|
||||
2006-11-15 Nicola Pero <nicola.pero@meta-innovation.com>
|
||||
|
||||
Notice: you should now use 'make DESTDIR=/tmp/xxx install' if you
|
||||
|
@ -11,7 +31,6 @@
|
|||
* GSWExtensionsGSW.framework/GNUmakefile: Same change.
|
||||
* Examples/hello/GNUmakefile: Same change.
|
||||
|
||||
|
||||
2006-10-04 David Ayers <ayers@fsfe.org>
|
||||
|
||||
* GSWeb.framework/GSWDefaultAdaptorThread.m
|
||||
|
|
|
@ -86,6 +86,25 @@ typedef apr_pool_t pool;
|
|||
typedef apr_array_header_t array_header;
|
||||
typedef apr_table_t table;
|
||||
typedef apr_table_entry_t table_entry;
|
||||
|
||||
|
||||
#ifndef ap_palloc
|
||||
#define ap_palloc apr_palloc
|
||||
#endif
|
||||
#ifndef ap_pstrdup
|
||||
#define ap_pstrdup apr_pstrdup
|
||||
#endif
|
||||
#ifndef ap_table_elts
|
||||
#define ap_table_elts apr_table_elts
|
||||
#endif
|
||||
#ifndef ap_table_add
|
||||
#define ap_table_add apr_table_add
|
||||
#endif
|
||||
|
||||
#ifndef ap_http_method
|
||||
#define ap_http_method ap_run_http_scheme
|
||||
#endif
|
||||
|
||||
#else
|
||||
//TODO: remove ??
|
||||
struct table
|
||||
|
|
|
@ -31,6 +31,8 @@
|
|||
#include <sys/socket.h>
|
||||
#include <sys/stat.h>
|
||||
#include <errno.h>
|
||||
#include <time.h>
|
||||
|
||||
#include "config.h"
|
||||
#include "GSWUtil.h"
|
||||
#include "GSWDict.h"
|
||||
|
@ -229,7 +231,7 @@ GSWAppInfo_MakeDictKeyName(char *pszName, int iInstance)
|
|||
{
|
||||
char *name = NULL;
|
||||
|
||||
if (name = calloc(1,50))
|
||||
if ((name = calloc(1,50)))
|
||||
{
|
||||
if (pszName)
|
||||
{
|
||||
|
|
|
@ -30,6 +30,7 @@
|
|||
#include <netdb.h>
|
||||
#include <sys/socket.h>
|
||||
#include <errno.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include "config.h"
|
||||
#include "GSWUtil.h"
|
||||
|
|
|
@ -199,7 +199,7 @@ GSWAppRequest_SendAppRequestToApp(GSWHTTPRequest **p_ppHTTPRequest,
|
|||
glbResponsesNb++;
|
||||
if (pHTTPResponse)
|
||||
{
|
||||
char *value =
|
||||
CONST char *value =
|
||||
GSWDict_ValueForKey(pHTTPResponse->pHeaders,
|
||||
"x-gsweb-refusing-redirection");
|
||||
if (value && (strncmp(value,"YES",3)==0))
|
||||
|
|
|
@ -28,6 +28,7 @@ static char rcsId[] = "$Id$";
|
|||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
#include <sys/types.h>
|
||||
#include <unistd.h>
|
||||
#include <netinet/in.h>
|
||||
#include <netdb.h>
|
||||
#include <sys/socket.h>
|
||||
|
|
|
@ -39,9 +39,6 @@
|
|||
|
||||
|
||||
extern GSWLock g_lockAppList;
|
||||
extern GSWDict *g_pAppDict;
|
||||
extern time_t config_mtime;
|
||||
|
||||
|
||||
extern const char *g_szGSWeb_AdaptorVersion;
|
||||
|
||||
|
@ -105,6 +102,9 @@ typedef struct _GSWConfig
|
|||
} GSWConfig;
|
||||
|
||||
|
||||
BOOL
|
||||
GSWConfig_LoadConfiguration(void *p_pLogServerData);
|
||||
|
||||
EGSWConfigResult GSWConfig_ReadIFND(CONST char *p_pszConfigPath,
|
||||
time_t *p_pLastReadTime,
|
||||
proplist_t *p_ppPropList,//Please, PLRelease it after used !
|
||||
|
|
|
@ -26,6 +26,7 @@
|
|||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
#include <sys/param.h>
|
||||
#include <netdb.h>
|
||||
|
||||
#include "config.h"
|
||||
#include "GSWUtil.h"
|
||||
|
|
|
@ -173,7 +173,6 @@ GSWLoadBalancing_FindInstance(GSWAppRequest *p_pAppRequest,
|
|||
{
|
||||
BOOL fFound=FALSE;
|
||||
GSWApp *pApp=NULL;
|
||||
int i=0;
|
||||
|
||||
GSWDebugLog(p_pLogServerData,"Start GSWLoadBalancing_FindInstance");
|
||||
|
||||
|
|
|
@ -78,7 +78,6 @@ char* GSWStats_formatStats(GSWTimeStats *p_pStats,
|
|||
double baseFloatSec=GSWTime_floatSec(p_pStats->_beginSendRequestTS-baseTS);
|
||||
char* p=p_pStats->_pszApplicationStats;
|
||||
char* resultStats=NULL;
|
||||
int i=0;
|
||||
p_pStats->_pszRecalculedApplicationStats=malloc(applicatonStatsLen+100);
|
||||
resultStats=p_pStats->_pszRecalculedApplicationStats;
|
||||
while(*p)
|
||||
|
|
|
@ -59,7 +59,6 @@ GSWParseURL(GSWURLComponents *p_pURLComponents,
|
|||
CONST char *pszQueryStringMark=strchr(pszStart,'?');
|
||||
CONST char *pszTmpStop=(pszQueryStringMark && pszQueryStringMark<pszURLEnd) ?
|
||||
pszQueryStringMark : pszURLEnd;
|
||||
int i, j;
|
||||
memset(p_pURLComponents,0,sizeof(GSWURLComponents));
|
||||
|
||||
// First, get URL prefix
|
||||
|
|
Loading…
Reference in a new issue