[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=c10bc00

The following commit has been merged in the master branch:
commit c10bc003a7bc5fd1b393bed47e918e96998a5845
Author: Robin Mills <robin at clanmills.com>
Date:   Thu Sep 29 15:30:55 2016 +0000

    #1023 Fix getDataByRange CURLOPT_SSL_VERIFYHOST.  Fix http-test.sh (and associated test/data/http-test.out).
---
 src/basicio.cpp         |  2 ++
 test/data/http-test.out | 16 ++++++++--------
 test/http-test.sh       |  8 ++++----
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/basicio.cpp b/src/basicio.cpp
index dbefcf3..43e5b8e 100644
--- a/src/basicio.cpp
+++ b/src/basicio.cpp
@@ -2263,6 +2263,8 @@ namespace Exiv2 {
         curl_easy_setopt(curl_, CURLOPT_WRITEDATA, &response);
         curl_easy_setopt(curl_, CURLOPT_SSL_VERIFYPEER, 0L);
         curl_easy_setopt(curl_, CURLOPT_CONNECTTIMEOUT, timeout_);
+        curl_easy_setopt(curl_, CURLOPT_SSL_VERIFYHOST, 0L);
+
         //curl_easy_setopt(curl_, CURLOPT_VERBOSE, 1); // debugging mode
 
         if (lowBlock > -1 && highBlock> -1) {
diff --git a/test/data/http-test.out b/test/data/http-test.out
index 064489e..c915994 100644
--- a/test/data/http-test.out
+++ b/test/data/http-test.out
@@ -1,14 +1,14 @@
-http://exiv2.dyndns.org:8080/userContent/testfiles/webready//Reagan.jpg
+http://exiv2.dyndns.org:8080/userContent/testfiles/webready/Reagan.jpg
 Exif.Image.Software                          Ascii      40  Adobe Photoshop Elements 12.0 Macintosh
-http://exiv2.dyndns.org:8080/userContent/testfiles/webready//ReaganLargePng.png
+http://exiv2.dyndns.org:8080/userContent/testfiles/webready/ReaganLargePng.png
 Exif.Image.Software                          Ascii      11  GIMP 2.9.5
-http://exiv2.dyndns.org:8080/userContent/testfiles/webready//ReaganLargeTiff.tiff
-http://exiv2.dyndns.org:8080/userContent/testfiles/webready//ReaganLargeJpg.jpg
+http://exiv2.dyndns.org:8080/userContent/testfiles/webready/ReaganLargeTiff.tiff
+http://exiv2.dyndns.org:8080/userContent/testfiles/webready/ReaganLargeJpg.jpg
 Exif.Image.Software                          Ascii      12  GIMP 2.8.18
-https://exiv2.dyndns.org:8443/userContent/testfiles/webready//Reagan.jpg
+https://exiv2.dyndns.org:8443/userContent/testfiles/webready/Reagan.jpg
 Exif.Image.Software                          Ascii      40  Adobe Photoshop Elements 12.0 Macintosh
-https://exiv2.dyndns.org:8443/userContent/testfiles/webready//ReaganLargePng.png
+https://exiv2.dyndns.org:8443/userContent/testfiles/webready/ReaganLargePng.png
 Exif.Image.Software                          Ascii      11  GIMP 2.9.5
-https://exiv2.dyndns.org:8443/userContent/testfiles/webready//ReaganLargeTiff.tiff
-https://exiv2.dyndns.org:8443/userContent/testfiles/webready//ReaganLargeJpg.jpg
+https://exiv2.dyndns.org:8443/userContent/testfiles/webready/ReaganLargeTiff.tiff
+https://exiv2.dyndns.org:8443/userContent/testfiles/webready/ReaganLargeJpg.jpg
 Exif.Image.Software                          Ascii      12  GIMP 2.8.18
diff --git a/test/http-test.sh b/test/http-test.sh
index 7742bc5..4de842b 100755
--- a/test/http-test.sh
+++ b/test/http-test.sh
@@ -6,9 +6,9 @@ source ./functions.source
 
 (   cd "$testdir"
 
-    host=http://exiv2.dyndns.org:8080/
-    dir=userContent/testfiles/webready/
-    for host in http://exiv2.dyndns.org:8080 https://exiv2.dyndns.org:8443
+    server=exiv2.dyndns.org
+    dir=userContent/testfiles/webready
+    for host in http://$server:8080 https://$server:8443
     do
     	printf "$host " >&3
 		for filename in Reagan.jpg ReaganLargePng.png ReaganLargeTiff.tiff ReaganLargeJpg.jpg
@@ -18,7 +18,7 @@ source ./functions.source
 		done
 	done
 
-) 3>&1 > $results 2>&1
+) 3>&1 2>&1 > $results
 
 printf "
"
 

-- 
exiv2 packaging