rpms/curl/F-13 0005-curl-7.20.1-47dda4a.patch,1.1,1.2

[Kamil Dudka]

Author: kdudka

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

Modified Files:
	0005-curl-7.20.1-47dda4a.patch 
Log Message:
keep the CHANGES file in chronological order

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

Index: 0005-curl-7.20.1-47dda4a.patch
===================================================================
RCS file: /cvs/extras/rpms/curl/F-13/0005-curl-7.20.1-47dda4a.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 0005-curl-7.20.1-47dda4a.patch	26 May 2010 11:12:49 -0000	1.1
+++ 0005-curl-7.20.1-47dda4a.patch	27 May 2010 08:00:53 -0000	1.2
@@ -3,20 +3,20 @@
  2 files changed, 24 insertions(+), 3 deletions(-)
 
 diff --git a/CHANGES b/CHANGES
-index 7928690..db2d68b 100644
+index 7928690..92c2753 100644
 --- a/CHANGES
 +++ b/CHANGES
-@@ -6,6 +6,10 @@
- 
-                                   Changelog
+@@ -17,6 +17,10 @@ Kamil Dudka (24 Apr 2010)
+ - Fixed SSL handshake timeout underflow in libcurl-NSS, which caused test405
+   to hang on a slow machine.
  
 +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.
 +
- Kamil Dudka (11 May 2010)
- - CRL support in libcurl-NSS has been completely broken. Now it works. Original
-   bug report: https://bugzilla.redhat.com/581926
+ Version 7.20.1 (14 April 2010)
+ 
+ Daniel Stenberg (9 Apr 2010)
 diff --git a/src/main.c b/src/main.c
 index 6e3ef3d..d532846 100644
 --- a/src/main.c