fc9dc32cb7
Don't do iso-to-utf conversion on text that's already UTF8, as that corrupts the text; the CHANGES file is a mixture of different encodings, which is why we need a patch to fix it rather than just running it through iconv in %prep.
58 lines
2.0 KiB
Diff
58 lines
2.0 KiB
Diff
From c6246783cf347652f70d95c0562dd411747e9d53 Mon Sep 17 00:00:00 2001
|
||
From: Kamil Dudka <kdudka@redhat.com>
|
||
Date: Wed, 31 Oct 2012 11:40:30 +0100
|
||
Subject: [PATCH] Fix character encoding of docs
|
||
|
||
..., which are of mixed encoding originally so a simple iconv can't
|
||
fix them.
|
||
---
|
||
CHANGES | 22 +++++++++++-----------
|
||
README | 2 +-
|
||
2 files changed, 12 insertions(+), 12 deletions(-)
|
||
|
||
diff --git a/CHANGES b/CHANGES
|
||
index 4568408..5fc1652 100644
|
||
--- a/CHANGES
|
||
+++ b/CHANGES
|
||
@@ -198,7 +198,7 @@ Daniel Stenberg (12 Nov 2012)
|
||
|
||
- [Gabriel Sjoberg brought this change]
|
||
|
||
- Digst: Add microseconds into nounce calculation
|
||
+ Digest: Add microseconds into nounce calculation
|
||
|
||
When using only 1 second precision, curl doesn't create new cnonce
|
||
values quickly enough for all uses.
|
||
@@ -209,7 +209,7 @@ Daniel Stenberg (12 Nov 2012)
|
||
curl --digest -utest:test http://tomcat.test.com:8080/manager/list
|
||
|
||
This is because curl uses the same cnonce for several seconds, but
|
||
- doesn't increment the nonce counter. Â Tomcat correctly interprets
|
||
+ doesn't increment the nonce counter. Â Tomcat correctly interprets
|
||
this as a replay attack and rejects the request.
|
||
|
||
When microsecond-precision is available, this commit causes curl to
|
||
@@ -5460,7 +5460,7 @@ Daniel Stenberg (12 Dec 2011)
|
||
linking with a static openssl requires a set of more libs to be linked
|
||
on Windows.
|
||
|
||
- Thanks also to Steve Holme and Martin Storsjö for additional feedback.
|
||
+ Thanks also to Steve Holme and Martin Storsjö for additional feedback.
|
||
|
||
Bug: http://curl.haxx.se/mail/lib-2011-12/0063.html
|
||
Reported by: Ward Willats
|
||
diff --git a/README b/README
|
||
index 2ffacc3..cfd6760 100644
|
||
--- a/README
|
||
+++ b/README
|
||
@@ -45,5 +45,5 @@ GIT
|
||
NOTICE
|
||
|
||
Curl contains pieces of source code that is Copyright (c) 1998, 1999
|
||
- Kungliga Tekniska Högskolan. This notice is included here to comply with the
|
||
+ Kungliga Tekniska Högskolan. This notice is included here to comply with the
|
||
distribution terms.
|
||
--
|
||
1.7.1
|
||
|