From 282798f52e2cde76eaeb1384d6fcbdc624c79611 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Wed, 5 May 2010 12:27:29 +0200 Subject: [PATCH] Give a nicer message on a malformed status line. --- src/ChangeLog | 4 ++++ src/http.c | 13 ++++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 34e3ad1f..4ba7cf46 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2010-05-05 Giuseppe Scrivano + + * http.c (gethttp): Give a nicer message on a malformed status line. + 2010-05-04 Giuseppe Scrivano * http.c (gethttp): Check `resp_status' return code and handle diff --git a/src/http.c b/src/http.c index 52ed8365..0ffbd66c 100644 --- a/src/http.c +++ b/src/http.c @@ -1890,8 +1890,11 @@ gethttp (struct url *u, struct http_stat *hs, int *dt, struct url *proxy, statcode = resp_status (resp, &message); if (statcode < 0) { - logprintf (LOG_NOTQUIET, _("Invalid server response.\n")); - CLOSE_INVALIDATE (sock); + char *tms = datetime_str (time (NULL)); + logprintf (LOG_VERBOSE, "%d\n", statcode); + logprintf (LOG_NOTQUIET, _("%s ERROR %d: %s.\n"), tms, statcode, + quotearg_style (escape_quoting_style, + _("Malformed status line"))); xfree (head); return HERR; } @@ -1985,7 +1988,11 @@ gethttp (struct url *u, struct http_stat *hs, int *dt, struct url *proxy, statcode = resp_status (resp, &message); if (statcode < 0) { - logprintf (LOG_NOTQUIET, _("Invalid server response.\n")); + char *tms = datetime_str (time (NULL)); + logprintf (LOG_VERBOSE, "%d\n", statcode); + logprintf (LOG_NOTQUIET, _("%s ERROR %d: %s.\n"), tms, statcode, + quotearg_style (escape_quoting_style, + _("Malformed status line"))); CLOSE_INVALIDATE (sock); request_free (req); return HERR;