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

patch from david ayers to avoid endless loop

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@22185 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Dave Wetzel 2005-12-19 10:11:35 +00:00
parent 8ee1195d11
commit f642b1e51a
1 changed files with 23 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

28
GSWAdaptors/Apache/mod_gsweb.c
View file

@ -725,12 +725,12 @@ GSWeb_Handler(request_rec *p_pRequestRec)
&& pRequest->uContentLength>0 && pRequest->uContentLength>0
&& ap_should_client_block(p_pRequestRec)) && ap_should_client_block(p_pRequestRec))
{ {
int iReadLength=0; long iReadLength=1;
int iRemainingLength = pRequest->uContentLength; long iRemainingLength = pRequest->uContentLength;
char *pszBuffer = malloc(pRequest->uContentLength); char *pszBuffer = malloc(pRequest->uContentLength);
char *pszData = pszBuffer; char *pszData = pszBuffer;
while (iRemainingLength>0) while (iRemainingLength>0 && iReadLength>0)
{ {
ap_soft_timeout("reading GSWeb request", ap_soft_timeout("reading GSWeb request",
p_pRequestRec); p_pRequestRec);
@ -738,8 +738,26 @@ GSWeb_Handler(request_rec *p_pRequestRec)
pszData, pszData,
iRemainingLength); iRemainingLength);
ap_kill_timeout(p_pRequestRec); ap_kill_timeout(p_pRequestRec);
pszData += iReadLength; if (iReadLength>0)
iRemainingLength-=iReadLength; {
pszData += iReadLength;
iRemainingLength-=iReadLength;
}
else
{
/* FIXME: I think we should so some better
error handling but we need this so that
we don't endup backtracking the entire
content upon error which will make the
server look like it's in an endless loop.
I'm not sure whether ap_get_client_block
can ever legally return 0 eventhough
iRemainingLength was larger that 0, but
in such a case this will also get us out
of a potential endless loop. */
memset(pszData,0,iRemainingLength);
iRemainingLength=0;
}
}; };
GSWLog(GSW_INFO,pLogServerData,"pszBuffer(%p)=%.*s", GSWLog(GSW_INFO,pLogServerData,"pszBuffer(%p)=%.*s",
(void *)pszBuffer, (void *)pszBuffer,