aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2018-12-05 18:20:00 +0100
committerChristian Grothoff <christian@grothoff.org>2018-12-05 18:20:00 +0100
commit79a8955bb61d62f6dc4fc93d2f05a08adf8596d5 (patch)
tree3cdaef3a9e2833ab731fcc31085fe643c36f7cd9
parent11eb7a48269b820f4c954127abdcd26e56111b99 (diff)
downloadlibmicrohttpd-79a8955bb61d62f6dc4fc93d2f05a08adf8596d5.tar.gz
libmicrohttpd-79a8955bb61d62f6dc4fc93d2f05a08adf8596d5.zip
fix #5496:
'
-rw-r--r--ChangeLog3
-rw-r--r--src/microhttpd/connection.c4
2 files changed, 3 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 505b459f..7fc917d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
1Wed Dec 5 18:08:59 CET 2018
2 Fix regression causing URLs to be unescaped twice. -CG
3
1Sun Nov 18 13:08:11 CET 2018 4Sun Nov 18 13:08:11 CET 2018
2 Parse arguments with (properly) escaped URLs correctly. 5 Parse arguments with (properly) escaped URLs correctly.
3 (making things work with recent cURL changes, #5473). 6 (making things work with recent cURL changes, #5473).
diff --git a/src/microhttpd/connection.c b/src/microhttpd/connection.c
index abc622e2..cd4e8257 100644
--- a/src/microhttpd/connection.c
+++ b/src/microhttpd/connection.c
@@ -2307,10 +2307,6 @@ parse_initial_message_line (struct MHD_Connection *connection,
2307 &connection_add_header, 2307 &connection_add_header,
2308 &unused_num_headers); 2308 &unused_num_headers);
2309 } 2309 }
2310 if (NULL != uri)
2311 daemon->unescape_callback (daemon->unescape_callback_cls,
2312 connection,
2313 uri);
2314 connection->url = curi; 2310 connection->url = curi;
2315 return MHD_YES; 2311 return MHD_YES;
2316} 2312}