version 1.29, 1997/02/06 06:04:20
|
version 1.30, 1997/02/06 20:10:43
|
Line 529 int status;
|
Line 529 int status;
|
boolean error_flag; |
boolean error_flag; |
char msg_status[10]; |
char msg_status[10]; |
HTError *error; |
HTError *error; |
|
HTErrorElement errorElement; |
HTList *cur; |
HTList *cur; |
|
|
if (!me) |
if (!me) |
Line 643 int status;
|
Line 644 int status;
|
me->reqStatus = HT_ERR; |
me->reqStatus = HT_ERR; |
} |
} |
} /* if-else HT_END, HT_ABORT, HT_ERROR */ |
} /* if-else HT_END, HT_ABORT, HT_ERROR */ |
if (HTLog_isOpen ()) |
|
HTLog_add (request, status); |
|
|
|
if ((me->mode & AMAYA_ASYNC) || (me->mode & AMAYA_IASYNC)) |
if ((me->mode & AMAYA_ASYNC) || (me->mode & AMAYA_IASYNC)) |
/* for the ASYNC mode, free the memory we allocated in GetObjectWWW |
/* for the ASYNC mode, free the memory we allocated in GetObjectWWW |
Line 688 int status;
|
Line 687 int status;
|
TtaSetStatus (me->docid, 1, TtaGetMessage (AMAYA, AM_METHOD_NOT_ALLOWED), (char *) NULL); |
TtaSetStatus (me->docid, 1, TtaGetMessage (AMAYA, AM_METHOD_NOT_ALLOWED), (char *) NULL); |
else if (status == -1) |
else if (status == -1) |
{ |
{ |
|
/* |
|
** Here we deal with errors for which libwww does not |
|
** return a correct status code |
|
*/ |
cur = HTRequest_error (request); |
cur = HTRequest_error (request); |
error = (HTError *) HTList_nextObject (cur); |
error = (HTError *) HTList_nextObject (cur); |
if ((HTErrorElement) error->element == HTERR_INTERNAL) |
errorElement = error->element; |
/* an error Henrik forgot :-/ */ |
if (errorElement == HTERR_NOT_IMPLEMENTED) |
{ |
{ |
TtaSetStatus (me->docid, 1, "Internal Server Error", (char *) NULL); |
TtaSetStatus (me->docid, 1, TtaGetMessage (AMAYA, AM_SERVER_NOT_IMPLEMENTED_501_ERROR), (char *) NULL); |
|
status = -501; |
|
} |
|
else if (errorElement == HTERR_INTERNAL) |
|
{ |
|
if ((error->length > 0) && (error->length <= 2) && |
|
(error->par) && (((char *) error->par)[0] != EOS)) |
|
TtaSetStatus (me->docid, 1, TtaGetMessage (AMAYA, AM_SERVER_INTERNAL_ERROR_500_CAUSE), (char *) (error->par)); |
|
else |
|
TtaSetStatus (me->docid, 1, TtaGetMessage (AMAYA, AM_SERVER_INTERNAL_ERROR_500_NO_CAUSE), (char *) NULL); |
status = -500; |
status = -500; |
} |
} |
} |
else |
else |
{ |
{ |
sprintf (msg_status, "%d", status); |
sprintf (msg_status, "%d", status); |
TtaSetStatus (me->docid, 1, TtaGetMessage (AMAYA, AM_UNKNOWN_XXX_STATUS), msg_status); |
TtaSetStatus (me->docid, 1, TtaGetMessage (AMAYA, AM_UNKNOWN_XXX_STATUS), msg_status); |
} |
} |
} |
} |
} |
return HT_OK; |
return HT_OK; |
Line 786 int status;
|
Line 798 int status;
|
break; |
break; |
} |
} |
|
|
/* Should we do logging? */ |
|
if (HTLog_isOpen ()) |
|
HTLog_add (request, status); |
|
HT_FREE (uri); |
HT_FREE (uri); |
|
|
return HT_OK; |
return HT_OK; |