version 1.159, 1998/12/17 16:56:57
|
version 1.160, 1998/12/21 09:45:08
|
Line 281 PicType contentType;
|
Line 281 PicType contentType;
|
{ |
{ |
HTAtom *atom; |
HTAtom *atom; |
char *filename; |
char *filename; |
HTEncoding enc; |
HTEncoding enc = NULL; |
HTEncoding cte; |
HTEncoding cte = NULL; |
HTLanguage lang; |
HTLanguage lang = NULL; |
double quality = 1.0; |
double quality = 1.0; |
|
|
switch (contentType) |
switch (contentType) |
Line 916 int status;
|
Line 916 int status;
|
if (status == HT_LOADED || |
if (status == HT_LOADED || |
status == HT_CREATED || |
status == HT_CREATED || |
status == HT_NO_DATA || |
status == HT_NO_DATA || |
|
/* kludge for work around libwww problem */ |
|
(status == HT_INTERRUPTED && me->method == METHOD_PUT) || |
#ifdef AMAYA_WWW_CACHE |
#ifdef AMAYA_WWW_CACHE |
/* what status to use to know we're downloading from a cache? */ |
/* what status to use to know we're downloading from a cache? */ |
status == HT_NOT_MODIFIED || |
status == HT_NOT_MODIFIED || |
Line 2703 int docid;
|
Line 2705 int docid;
|
#endif /* DEBUG_LIBWWW */ |
#endif /* DEBUG_LIBWWW */ |
/* enter the critical section */ |
/* enter the critical section */ |
lock_stop = TRUE; |
lock_stop = TRUE; |
HTNet_killAll (); |
/* HTHost_killPipe (me->request->net->host); */ |
|
/* HTNet_killAll (); */ |
cur = Amaya->reqlist; |
cur = Amaya->reqlist; |
while ((me = (AHTReqContext *) HTList_nextObject (cur))) |
while ((me = (AHTReqContext *) HTList_nextObject (cur))) |
{ |
{ |
if (AmayaIsAlive ()) |
if (AmayaIsAlive ()) |
if (me->reqStatus != HT_END) |
{ |
{ |
if (me->request->net) |
if (me->terminate_cbf) |
HTNet_killPipe (me->request->net); |
(*me->terminate_cbf) (me->docid, -1, me->urlName, |
else |
me->outputfile, |
{ |
me->content_type, me->context_tcbf); |
if (me->reqStatus != HT_END) |
|
{ |
|
if (me->terminate_cbf) |
|
(*me->terminate_cbf) (me->docid, -1, me->urlName, |
|
me->outputfile, |
|
me->content_type, |
|
me->context_tcbf); |
#ifdef DEBUG_LIBWWW |
#ifdef DEBUG_LIBWWW |
fprintf (stderr,"StopRequest: killing req %p, url %s, status %d\n", me, me->urlName, me->reqStatus); |
fprintf (stderr,"StopRequest: killing req %p, url %s, status %d\n", me, me->urlName, me->reqStatus); |
#endif /* DEBUG_LIBWWW */ |
#endif /* DEBUG_LIBWWW */ |
AHTReqContext_delete (me); |
AHTReqContext_delete (me); |
} |
cur = Amaya->reqlist; |
|
} |
#ifndef _WINDOWS |
#ifndef _WINDOWS |
#ifdef WWW_XWINDOWS |
#ifdef WWW_XWINDOWS |
/* to be on the safe side, remove all outstanding X events */ |
/* to be on the safe side, remove all outstanding X events */ |
else |
else |
RequestKillAllXtevents (me); |
RequestKillAllXtevents (me); |
#endif /* WWW_XWINDOWS */ |
#endif /* WWW_XWINDOWS */ |
#endif /* !_WINDOWS */ |
#endif /* !_WINDOWS */ |
|
} |
|
} |
} |
} |
/* expire all outstanding timers */ |
/* expire all outstanding timers */ |
HTTimer_expireAll (); |
HTTimer_expireAll (); |