mirror of
https://github.com/gnustep/libs-gsweb.git
synced 2025-02-21 02:41:04 +00:00
* 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 git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@36691 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
ac2b24d8fb
commit
25cd649e64
4 changed files with 15 additions and 52 deletions
|
@ -16,6 +16,12 @@
|
||||||
* GSWDatabase/WODisplayGroup.m
|
* GSWDatabase/WODisplayGroup.m
|
||||||
uncomment the right method, and use an NSIndexSet
|
uncomment the right method, and use an NSIndexSet
|
||||||
where needed instead of NSArray
|
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 <sebastia@l00-bugdead-prods.de>
|
2013-05-30: Sebastian Reitenbach <sebastia@l00-bugdead-prods.de>
|
||||||
* GSWeb/GSWElement.h
|
* GSWeb/GSWElement.h
|
||||||
|
|
|
@ -103,7 +103,7 @@ The format is (there is an example for values below):
|
||||||
host = IPAdressOfTheComputerOnWhichRunTheApplication;
|
host = IPAdressOfTheComputerOnWhichRunTheApplication;
|
||||||
port = ThePortListenByTheApplication;
|
port = ThePortListenByTheApplication;
|
||||||
parameters = { transport= socket; };
|
parameters = { transport= socket; };
|
||||||
}
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -131,53 +131,3 @@ Example values for a localhost use:
|
||||||
|
|
||||||
Now, develop an application and run it !
|
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)
|
|
||||||
<Location /GSWeb*>
|
|
||||||
SetHandler GSWeb
|
|
||||||
</Location>
|
|
||||||
|
|
||||||
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)
|
|
||||||
<Location /GSWeb*>
|
|
||||||
SetHandler GSWeb
|
|
||||||
</Location>
|
|
||||||
|
|
||||||
o create your gsweb configuration file (see ../Doc/ConfigurationFile.html)
|
|
||||||
|
|
||||||
|
|
|
@ -429,6 +429,7 @@ copyHeaders(request_rec *p_pRequestRec,
|
||||||
GSWHTTPRequest_AddHeader(p_pGSWHTTPRequest,
|
GSWHTTPRequest_AddHeader(p_pGSWHTTPRequest,
|
||||||
g_szServerInfo_ScriptFileName,
|
g_szServerInfo_ScriptFileName,
|
||||||
p_pRequestRec->filename);
|
p_pRequestRec->filename);
|
||||||
|
#if 0
|
||||||
pszPort = APR_PSPRINTF(p_pRequestRec->pool,
|
pszPort = APR_PSPRINTF(p_pRequestRec->pool,
|
||||||
"%u",
|
"%u",
|
||||||
#ifdef Apache2
|
#ifdef Apache2
|
||||||
|
@ -440,6 +441,7 @@ copyHeaders(request_rec *p_pRequestRec,
|
||||||
GSWHTTPRequest_AddHeader(p_pGSWHTTPRequest,
|
GSWHTTPRequest_AddHeader(p_pGSWHTTPRequest,
|
||||||
g_szServerInfo_RemotePort,
|
g_szServerInfo_RemotePort,
|
||||||
pszPort);
|
pszPort);
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef Apache2
|
#ifdef Apache2
|
||||||
//TODO
|
//TODO
|
||||||
|
@ -745,7 +747,12 @@ GSWeb_Handler(request_rec *p_pRequestRec)
|
||||||
&& ap_should_client_block(p_pRequestRec))
|
&& ap_should_client_block(p_pRequestRec))
|
||||||
{
|
{
|
||||||
long iReadLength=0;
|
long iReadLength=0;
|
||||||
|
|
||||||
|
#ifdef Apache2
|
||||||
apr_size_t iRemainingLength = pRequest->uContentLength;
|
apr_size_t iRemainingLength = pRequest->uContentLength;
|
||||||
|
#else
|
||||||
|
size_t iRemainingLength = pRequest->uContentLength;
|
||||||
|
#endif
|
||||||
char *pszBuffer = malloc(pRequest->uContentLength);
|
char *pszBuffer = malloc(pRequest->uContentLength);
|
||||||
char *pszData = pszBuffer;
|
char *pszData = pszBuffer;
|
||||||
|
|
||||||
|
|
|
@ -288,7 +288,7 @@ GSWConfig_ReadIFND(CONST char *p_pszConfigPath,
|
||||||
if (*p_ppPropList)
|
if (*p_ppPropList)
|
||||||
{
|
{
|
||||||
GSWLog(__FILE__, __LINE__, GSW_WARNING,p_pLogServerData,
|
GSWLog(__FILE__, __LINE__, GSW_WARNING,p_pLogServerData,
|
||||||
"GSWConfig_ReadIFND: New configuration from %s readen",
|
"GSWConfig_ReadIFND: New configuration from %s read",
|
||||||
p_pszConfigPath);
|
p_pszConfigPath);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in a new issue