version 1.48, 1997/10/20 11:01:35
|
version 1.49, 1998/01/26 17:26:32
|
Line 184 XtInputId *id;
|
Line 184 XtInputId *id;
|
if (me->reqStatus == HT_ABORT) { |
if (me->reqStatus == HT_ABORT) { |
/* Has the user stopped the request? */ |
/* Has the user stopped the request? */ |
me->reqStatus = HT_WAITING; |
me->reqStatus = HT_WAITING; |
|
me->mode &= ~AMAYA_ASYNC_SAFE_STOP; |
StopRequest (me->docid); |
StopRequest (me->docid); |
return (0); |
return (0); |
} |
} |
Line 216 XtInputId *id;
|
Line 217 XtInputId *id;
|
#ifdef DEBUG_LIBWWW |
#ifdef DEBUG_LIBWWW |
fprintf (stderr, "(BF) removing Xtinput %lu !RWE, sock %d (Request has ended)\n", *id, socket); |
fprintf (stderr, "(BF) removing Xtinput %lu !RWE, sock %d (Request has ended)\n", *id, socket); |
#endif |
#endif |
ProcessTerminateRequest (me); |
|
|
|
if ((me->mode & AMAYA_ASYNC) || (me->mode & AMAYA_IASYNC)) |
if ((me->mode & AMAYA_ASYNC) || (me->mode & AMAYA_IASYNC)) |
{ |
{ |
Line 261 AHTReqContext *me;
|
Line 261 AHTReqContext *me;
|
if (me->reqStatus == HT_END) |
if (me->reqStatus == HT_END) |
{ |
{ |
if (me->terminate_cbf) |
if (me->terminate_cbf) |
(*me->terminate_cbf) ((AHTReqContext *) me, |
(*me->terminate_cbf) (me->docid, 0, me->urlName, me->outputfile, |
HT_LOADED); |
me->content_type, me->context_tcbf); |
} |
} |
else if (me->reqStatus == HT_ABORT) |
else if (me->reqStatus == HT_ABORT) |
/* either the application ended or the user pressed the stop |
/* either the application ended or the user pressed the stop |
Line 278 AHTReqContext *me;
|
Line 278 AHTReqContext *me;
|
{ |
{ |
/* there was an error */ |
/* there was an error */ |
if (me->terminate_cbf) |
if (me->terminate_cbf) |
(*me->terminate_cbf) ((AHTReqContext *) me, |
(*me->terminate_cbf) (me->docid, -1, me->urlName, me->outputfile, |
HT_ERROR); |
me->content_type, me->context_tcbf); |
|
|
if (me->outputfile && me->outputfile[0] != EOS) |
if (me->outputfile && me->outputfile[0] != EOS) |
{ |
{ |
Line 287 AHTReqContext *me;
|
Line 287 AHTReqContext *me;
|
me->outputfile[0] = EOS; |
me->outputfile[0] = EOS; |
} |
} |
} |
} |
|
else if (me->reqStatus == HT_ABORT) |
|
{ |
|
if (me->outputfile && me->outputfile[0] != EOS) |
|
{ |
|
TtaFileUnlink (me->outputfile); |
|
me->outputfile[0] = EOS; |
|
} |
|
} |
|
|
#ifdef _WINDOWS |
#ifdef _WINDOWS |
/* we erase the context if we're dealing with an asynchronous request */ |
/* we erase the context if we're dealing with an asynchronous request */ |
if ((me->mode & AMAYA_ASYNC) || |
if ((me->mode & AMAYA_ASYNC) || |