← Back to branch summary

~ubuntu-branches/ubuntu/saucy/curl/saucy-201307251546

« back to all changes in this revision

Viewing changes to debian/patches/05_fix-git-over-https.patch

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2013-02-12 08:54:32 UTC
  • mfrom: (3.4.34 sid)
  • Revision ID: package-import@ubuntu.com-20130212085432-r1fyi0b37enr93pp
Tags: 7.29.0-1ubuntu1
* Resynchronise with Debian. Remaining changes:
  - Drop dependencies not in main:
    + Build-Depends: Drop stunnel4 and libssh2-1-dev.
    + Drop libssh2-1-dev from binary package Depends.
  - Add new libcurl3-udeb package.
  - Add new curl-udeb package.
* Add warning to debian/patches/series.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/05_fix-git-over-https.patch
1
 
Description: Fix git over HTTPS
2
 
Origin: upstream, commits 1a02e84 and 2045d83
3
 
Bug-Debian: http://bugs.debian.org/690551
4
 
Author: Alessandro Ghedini <ghedo@debian.org>
5
 
Reviewed-by: Alessandro Ghedini <ghedo@debian.org>
6
 
Last-Update: 2012-11-16
7
 
 
8
 
diff -u b/lib/gtls.c b/lib/gtls.c
9
 
--- b/lib/gtls.c
10
 
+++ b/lib/gtls.c
11
 
@@ -299,10 +299,11 @@
12
 
       connssl->connecting_state =
13
 
         gnutls_record_get_direction(session)?
14
 
         ssl_connect_2_writing:ssl_connect_2_reading;
15
 
+      continue;
16
 
       if(nonblocking)
17
 
         return CURLE_OK;
18
 
     }
19
 
-    else if((rc < 0) && gnutls_error_is_fatal(rc)) {
20
 
+    else if((rc < 0) && !gnutls_error_is_fatal(rc)) {
21
 
       failf(data, "gnutls_handshake() warning: %s", gnutls_strerror(rc));
22
 
     }
23
 
     else if(rc < 0) {