[svn] Would forget to close the connection when keep_alive was not used.

diff --git a/src/ChangeLog b/src/ChangeLog
index 1ed3c003d5439a50406dbe86a885aa943bb80953..ced611bf64cc979c66f2010887736bad46b166c9 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-14  Hrvoje Niksic  <hniksic@xemacs.org>
+
+       * http.c (gethttp): Would forget to close the connection when
+       keep_alive was not used.
+
 2005-05-13  Hrvoje Niksic  <hniksic@xemacs.org>
 
        * openssl.c (pattern_match): Document the code that decides

diff --git a/src/http.c b/src/http.c
index c6e83decd1c9ae69f8ffb0cca0aebfd7cb40435a..b2027a93b15971e533b48d765dab5ce341dbcdd5 100644 (file)
--- a/src/http.c
+++ b/src/http.c
@@ -1625,13 +1625,10 @@ gethttp (struct url *u, struct http_stat *hs, int *dt, struct url *proxy)
   if (statcode == HTTP_STATUS_UNAUTHORIZED)
     {
       /* Authorization is required.  */
-      if (keep_alive)
-       {
-         if (skip_short_body (sock, contlen))
-           CLOSE_FINISH (sock);
-         else
-           CLOSE_INVALIDATE (sock);
-       }
+      if (keep_alive && skip_short_body (sock, contlen))
+       CLOSE_FINISH (sock);
+      else
+       CLOSE_INVALIDATE (sock);
       pconn.authorized = 0;
       if (!auth_finished && (user && passwd))
        {
@@ -1768,13 +1765,10 @@ gethttp (struct url *u, struct http_stat *hs, int *dt, struct url *proxy)
                     _("Location: %s%s\n"),
                     hs->newloc ? escnonprint_uri (hs->newloc) : _("unspecified"),
                     hs->newloc ? _(" [following]") : "");
-         if (keep_alive)
-           {
-             if (skip_short_body (sock, contlen))
-               CLOSE_FINISH (sock);
-             else
-               CLOSE_INVALIDATE (sock);
-           }
+         if (keep_alive && skip_short_body (sock, contlen))
+           CLOSE_FINISH (sock);
+         else
+           CLOSE_INVALIDATE (sock);
          xfree_null (type);
          return NEWLOCATION;
        }