rpms/curl/F-12 curl-7.20.1-47dda4a.patch, NONE, 1.1 curl.spec, 1.136, 1.137

[Kamil Dudka]

Author: kdudka

Update of /cvs/extras/rpms/curl/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv9211

Modified Files:
	curl.spec 
Added Files:
	curl-7.20.1-47dda4a.patch 
Log Message:
- fix -J/--remote-header-name to strip CR-LF (upstream patch)

curl-7.20.1-47dda4a.patch:
 CHANGES    |    4 ++++
 src/main.c |   23 ++++++++++++++++++++---
 2 files changed, 24 insertions(+), 3 deletions(-)

--- NEW FILE curl-7.20.1-47dda4a.patch ---
 CHANGES    |    4 ++++
 src/main.c |   23 ++++++++++++++++++++---
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index d24fa3e..627cdc2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,10 @@
 
                                   Changelog
 
+Daniel Stenberg (19 Apr 2010)
+- -J/--remote-header-name didn't strip trailing carriage returns or linefeeds
+  properly, so they could be used in the file name.
+
 Daniel Stenberg (22 Mar 2010)
 - Thomas Lopatic fixed the alarm()-based DNS timeout:
 
diff --git a/src/main.c b/src/main.c
index 84ed7d2..fa77695 100644
--- a/src/main.c
+++ b/src/main.c
@@ -4072,9 +4072,26 @@ parse_filename(char *ptr, int len)
     }
   }
 
-  q = strrchr(p, quote);
-  if (q)
-    *q = 0;
+  if(quote) {
+    /* if the file name started with a quote, then scan for the end quote and
+       stop there */
+    q = strrchr(p, quote);
+    if (q)
+      *q = 0;
+  }
+  else
+    q = NULL; /* no start quote, so no end has been found */
+
+  if(!q) {
+    /* make sure the file name doesn't end in \r or \n */
+    q = strchr(p, '\r');
+    if(q)
+      *q  = 0;
+
+    q = strchr(p, '\n');
+    if(q)
+      *q  = 0;
+  }
 
   if (copy!=p)
     memmove(copy, p, strlen(p)+1);


Index: curl.spec
===================================================================
RCS file: /cvs/extras/rpms/curl/F-12/curl.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -p -r1.136 -r1.137
--- curl.spec	23 Mar 2010 14:56:52 -0000	1.136
+++ curl.spec	26 May 2010 12:30:21 -0000	1.137
@@ -13,6 +13,10 @@ Patch4: curl-7.19.7-ssl-timeout.patch
 Patch5: curl-7.19.7-content-disposition.patch
 Patch6: curl-7.19.7-CHANGES.patch
 Patch7: curl-7.19.7-dns-timeout.patch
+
+# upstream commit 47dda4a1d43c9341753388ab3babb0d27cf34840
+Patch8: curl-7.20.1-47dda4a.patch
+
 Patch101: curl-7.15.3-multilib.patch
 Patch102: curl-7.16.0-privlibs.patch
 Patch103: curl-7.19.4-debug.patch
@@ -95,6 +99,7 @@ done
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 
 # other patches
 %patch4 -p1
@@ -197,7 +202,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
-* Tue Mar 23 2010 Kamil Dudka <kdudka at redhat.com> - 7.19.7-9
+* Wed May 26 2010 Kamil Dudka <kdudka at redhat.com> 7.19.7-10
+- fix -J/--remote-header-name to strip CR-LF (upstream patch)
+
+* Tue Mar 23 2010 Kamil Dudka <kdudka at redhat.com> 7.19.7-9
 - remove signal handler in case of DNS timeout (upstream commit 6657f12)
 
 * Sun Feb 28 2010 Dennis Gilmore <dennis at ausil.us> 7.19.7-8