[GNUnet-SVN] r26346 - in libmicrohttpd: . src/daemon

[gnunet]

Author: grothoff
Date: 2013-03-07 10:13:40 +0100 (Thu, 07 Mar 2013)
New Revision: 26346

Modified:
   libmicrohttpd/ChangeLog
   libmicrohttpd/src/daemon/Makefile.am
   libmicrohttpd/src/daemon/postprocessor.c
Log:
-fixing #2818

Modified: libmicrohttpd/ChangeLog
===================================================================
--- libmicrohttpd/ChangeLog     2013-03-07 08:46:28 UTC (rev 26345)
+++ libmicrohttpd/ChangeLog     2013-03-07 09:13:40 UTC (rev 26346)
@@ -1,3 +1,6 @@
+Thu Mar  7 10:13:08 CET 2013
+       Fix bug in postprocessor URL parser (#2818). -jgresula
+
 Mon Mar  4 13:45:35 CET 2013
        Fix dropping of SSL connections if uptime is less than
         MHD_OPTION_CONNECTION_TIMEOUT due to integer underflow (#2802). -greed

Modified: libmicrohttpd/src/daemon/Makefile.am
===================================================================
--- libmicrohttpd/src/daemon/Makefile.am        2013-03-07 08:46:28 UTC (rev 
26345)
+++ libmicrohttpd/src/daemon/Makefile.am        2013-03-07 09:13:40 UTC (rev 
26346)
@@ -65,7 +65,8 @@
 if HAVE_POSTPROCESSOR
 check_PROGRAMS += \
   postprocessor_test \
-  postprocessor_large_test 
+  postprocessor_large_test \
+  test_postprocessor_amp
 endif
 
 TESTS = $(check_PROGRAMS)
@@ -80,6 +81,11 @@
 postprocessor_test_LDADD = \
   $(top_builddir)/src/daemon/libmicrohttpd.la 
 
+test_postprocessor_amp_SOURCES = \
+  test_postprocessor_amp.c
+test_postprocessor_amp_LDADD = \
+  $(top_builddir)/src/daemon/libmicrohttpd.la 
+
 postprocessor_large_test_SOURCES = \
   postprocessor_large_test.c
 postprocessor_large_test_LDADD = \

Modified: libmicrohttpd/src/daemon/postprocessor.c
===================================================================
--- libmicrohttpd/src/daemon/postprocessor.c    2013-03-07 08:46:28 UTC (rev 
26345)
+++ libmicrohttpd/src/daemon/postprocessor.c    2013-03-07 09:13:40 UTC (rev 
26346)
@@ -435,7 +435,7 @@
                 {
                   pp->state = PP_ExpectNewLine;
                 }
-              else
+              else if (post_data[poff] == '&')
                 {
                   poff++;       /* skip '&' */
                   pp->state = PP_Init;