Changeset 30806

Timestamp:

2012-03-04T16:53:51+01:00 (6 years ago)

Author:

jow

Message:

[package] uhttpd: cope with variable number of spaces in header lines (#11079)

Location:

trunk/package/uhttpd

Files:

• Makefile (modified) (2 diffs)
• src/uhttpd.c (modified) (1 diff)

trunk/package/uhttpd/Makefile

@@ -1 +1 @@
 #
-# Copyright (C) 2010-2011 Jo-Philipp Wich <xm@subsignal.org>
+# Copyright (C) 2010-2012 Jo-Philipp Wich <xm@subsignal.org>
 #
 # This is free software, licensed under the GNU General Public License v2.
@@ -9 +9 @@
 
 PKG_NAME:=uhttpd
-PKG_RELEASE:=30
+PKG_RELEASE:=31
 
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)

trunk/package/uhttpd/src/uhttpd.c

@@ -338 +338 @@
 
                         /* have name but no value and found a colon, start of value */
-                        else if( hdrname && !hdrdata && ((i+2) < buflen) &&
-                                (buffer[i] == ':') && (buffer[i+1] == ' ')
+                        else if( hdrname && !hdrdata &&
+                            ((i+1) < buflen) && (buffer[i] == ':')
                         ) {
                                 buffer[i] = 0;
-                                hdrdata = &buffer[i+2];
+                                hdrdata = &buffer[i+1];
+
+                                while ((hdrdata + 1) < (buffer + buflen) && *hdrdata == ' ')
+                                        hdrdata++;
                         }