diff --git a/ChangeLog b/ChangeLog index e490f4c..687599f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,12 @@ * GSWDatabase/WODisplayGroup.m uncomment the right method, and use an NSIndexSet where needed instead of NSArray + * GSWAdaptors/Apache/INSTALL + add a missing semicolon, and remove deprecated documentation + * GSWAdaptors/Apache/mod_gsweb.c + make it compile with OpenBSD Apache 1.X + * GSWAdaptors/common/GSWConfig.c + fix output 2013-05-30: Sebastian Reitenbach * GSWeb/GSWElement.h diff --git a/GSWAdaptors/Apache/INSTALL b/GSWAdaptors/Apache/INSTALL index 8bf073b..7132179 100644 --- a/GSWAdaptors/Apache/INSTALL +++ b/GSWAdaptors/Apache/INSTALL @@ -103,7 +103,7 @@ The format is (there is an example for values below): host = IPAdressOfTheComputerOnWhichRunTheApplication; port = ThePortListenByTheApplication; parameters = { transport= socket; }; - } + }; }; }; }; @@ -131,53 +131,3 @@ Example values for a localhost use: Now, develop an application and run it ! -Deprecated Documentation -************************ -You have to do: - -For Apache 1.x: - o make -f GNUmakefile-Apache1x - o copy mod_gsweb.so in apache libexec (the apache directory of modules, in which you should have mod_mime.so, mod_alias.so,...) - o edit your apache configuration file: - - - Add - - LoadModule GSWeb_Module libexec/mod_gsweb.so - AddModule mod_gsweb.c - - - Add Global configuration directives: - o gsweb configuration file path - GSWeb_ConfigFilePath /etc/httpd/conf/gsweb.conf (for exemple) - o gsweb alias - GSWeb_Alias /GSWeb (for exemple) - - - Add the following lines for a virtual host (or all hosts) - - SetHandler GSWeb - - - o create your gsweb configuration file (see ../Doc/ConfigurationFile.html) - - -For Apache 2.x: - o make -f GNUmakefile-Apache2x all - o copy mod_gsweb.so in apache libexec (the apache directory of modules, in which you should have mod_mime.so, mod_alias.so,...) - o edit your apache configuration file: - - - Add - - LoadModule GSWeb_Module libexec/mod_gsweb.so - - - Add Global configuration directives: - o gsweb configuration file path - GSWeb_ConfigFilePath /etc/httpd/conf/gsweb.conf (for exemple) - o gsweb alias - GSWeb_Alias /GSWeb (for exemple) - - - Add the following lines for a virtual host (or all hosts) - - SetHandler GSWeb - - - o create your gsweb configuration file (see ../Doc/ConfigurationFile.html) - diff --git a/GSWAdaptors/Apache/mod_gsweb.c b/GSWAdaptors/Apache/mod_gsweb.c index c7e112e..1b7225a 100644 --- a/GSWAdaptors/Apache/mod_gsweb.c +++ b/GSWAdaptors/Apache/mod_gsweb.c @@ -429,6 +429,7 @@ copyHeaders(request_rec *p_pRequestRec, GSWHTTPRequest_AddHeader(p_pGSWHTTPRequest, g_szServerInfo_ScriptFileName, p_pRequestRec->filename); +#if 0 pszPort = APR_PSPRINTF(p_pRequestRec->pool, "%u", #ifdef Apache2 @@ -440,6 +441,7 @@ copyHeaders(request_rec *p_pRequestRec, GSWHTTPRequest_AddHeader(p_pGSWHTTPRequest, g_szServerInfo_RemotePort, pszPort); +#endif #ifdef Apache2 //TODO @@ -745,7 +747,12 @@ GSWeb_Handler(request_rec *p_pRequestRec) && ap_should_client_block(p_pRequestRec)) { long iReadLength=0; + +#ifdef Apache2 apr_size_t iRemainingLength = pRequest->uContentLength; +#else + size_t iRemainingLength = pRequest->uContentLength; +#endif char *pszBuffer = malloc(pRequest->uContentLength); char *pszData = pszBuffer; diff --git a/GSWAdaptors/common/GSWConfig.c b/GSWAdaptors/common/GSWConfig.c index cf0fa9b..24792c0 100644 --- a/GSWAdaptors/common/GSWConfig.c +++ b/GSWAdaptors/common/GSWConfig.c @@ -288,7 +288,7 @@ GSWConfig_ReadIFND(CONST char *p_pszConfigPath, if (*p_ppPropList) { GSWLog(__FILE__, __LINE__, GSW_WARNING,p_pLogServerData, - "GSWConfig_ReadIFND: New configuration from %s readen", + "GSWConfig_ReadIFND: New configuration from %s read", p_pszConfigPath); } else