X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=src%2Fheaders.c;h=c942ca3f899ac93242b1c6b25088eb0acd331e23;hp=45ab9875b2b43816cddc532007a81c09468029b8;hb=d9fea91a0a319e348adb504bd3edff148ff3d8a0;hpb=0b056d17201d2bae32857dbec4c8f7a95578cdf9

diff --git a/src/headers.c b/src/headers.c
index 45ab9875..c942ca3f 100644
--- a/src/headers.c
+++ b/src/headers.c
@@ -15,7 +15,17 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with Wget; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+In addition, as a special exception, the Free Software Foundation
+gives permission to link the code of its release of Wget with the
+OpenSSL project's "OpenSSL" library (or with modified versions of it
+that use the same license as the "OpenSSL" library), and distribute
+the linked executables.  You must obey the GNU General Public License
+in all respects for all of the code used other than "OpenSSL".  If you
+modify this file, you may extend this exception to your version of the
+file, but you are not obligated to do so.  If you do not wish to do
+so, delete this exception statement from your version.  */
 
 #include <config.h>
 
@@ -29,7 +39,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #include "wget.h"
 #include "connect.h"
-#include "rbuf.h"
 #include "headers.h"
 
 /* This file contains the generic routines for work with headers.
@@ -52,72 +61,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
    The public functions are header_get() and header_process(), which
    see.  */
 
-
-/* Get a header from read-buffer RBUF and return it in *HDR.
-
-   As defined in RFC2068 and elsewhere, a header can be folded into
-   multiple lines if the continuation line begins with a space or
-   horizontal TAB.  Also, this function will accept a header ending
-   with just LF instead of CRLF.
-
-   The header may be of arbitrary length; the function will allocate
-   as much memory as necessary for it to fit.  It need not contain a
-   `:', thus you can use it to retrieve, say, HTTP status line.
 
-   The trailing CRLF or LF are stripped from the header, and it is
-   zero-terminated.   #### Is this well-behaved?  */
-int
-header_get (struct rbuf *rbuf, char **hdr, enum header_get_flags flags)
-{
-  int i;
-  int bufsize = 80;
-
-  *hdr = (char *)xmalloc (bufsize);
-  for (i = 0; 1; i++)
-    {
-      int res;
-      /* #### Use DO_REALLOC?  */
-      if (i > bufsize - 1)
-	*hdr = (char *)xrealloc (*hdr, (bufsize <<= 1));
-      res = RBUF_READCHAR (rbuf, *hdr + i);
-      if (res == 1)
-	{
-	  if ((*hdr)[i] == '\n')
-	    {
-	      if (!((flags & HG_NO_CONTINUATIONS)
-		    || i == 0
-		    || (i == 1 && (*hdr)[0] == '\r')))
-		{
-		  char next;
-		  /* If the header is non-empty, we need to check if
-		     it continues on to the other line.  We do that by
-		     peeking at the next character.  */
-		  res = rbuf_peek (rbuf, &next);
-		  if (res == 0)
-		    return HG_EOF;
-		  else if (res == -1)
-		    return HG_ERROR;
-		  /*  If the next character is HT or SP, just continue.  */
-		  if (next == '\t' || next == ' ')
-		    continue;
-		}
-	      /* The header ends.  */
-	      (*hdr)[i] = '\0';
-	      /* Get rid of '\r'.  */
-	      if (i > 0 && (*hdr)[i - 1] == '\r')
-		(*hdr)[i - 1] = '\0';
-	      break;
-	    }
-	}
-      else if (res == 0)
-	return HG_EOF;
-      else
-	return HG_ERROR;
-    }
-  DEBUGP (("%s\n", *hdr));
-  return HG_OK;
-}
-
 /* Check whether HEADER begins with NAME and, if yes, skip the `:' and
    the whitespace, and call PROCFUN with the arguments of HEADER's
    contents (after the `:' and space) and ARG.  Otherwise, return 0.  */
@@ -149,6 +93,15 @@ header_extract_number (const char *header, void *closure)
 
   for (result = 0; ISDIGIT (*p); p++)
     result = 10 * result + (*p - '0');
+
+  /* Failure if no number present. */
+  if (p == header)
+    return 0;
+
+  /* Skip trailing whitespace. */
+  p += skip_lws (p);
+
+  /* Indicate failure if trailing garbage is present. */
   if (*p)
     return 0;