restore the functionality of 'curl -u :'

This commit is contained in:
Kamil Dudka 2013-07-01 11:41:28 +02:00
parent 0c72223810
commit ad17697486
2 changed files with 45 additions and 1 deletions

View File

@ -0,0 +1,37 @@
From 8d1d6c18015de5db2b2a1f499b6d341f86505810 Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Sun, 30 Jun 2013 19:51:16 +0200
Subject: [PATCH] url: restore the functionality of 'curl -u :'
This commit fixes a regression introduced in
fddb7b44a79d78e05043e1c97e069308b6b85f79.
Reported by: Markus Moeller
Bug: http://curl.haxx.se/mail/archive-2013-06/0052.html
[upstream commit abca89aaa0fb208cfaf4ead6692014c4e553388a]
---
lib/url.c | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/lib/url.c b/lib/url.c
index 7ba4969..4231d37 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -317,6 +317,13 @@ static CURLcode setstropt_userpwd(char *option, char **userp, char **passwdp,
if(!result) {
/* Store the username part of option if required */
if(userp) {
+ if(!user && option && option[0] == ':') {
+ /* Allocate an empty string instead of returning NULL as user name */
+ user = strdup("");
+ if(!user)
+ result = CURLE_OUT_OF_MEMORY;
+ }
+
Curl_safefree(*userp);
*userp = user;
}
--
1.7.1

View File

@ -1,7 +1,7 @@
Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
Name: curl
Version: 7.31.0
Release: 2%{?dist}
Release: 3%{?dist}
License: MIT
Group: Applications/Internet
Source: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma
@ -10,6 +10,9 @@ Source2: curlbuild.h
# test1230: avoid using hard-wired port number
Patch1: 0001-curl-7.31.0-02964ed6.patch
# restore the functionality of 'curl -u :'
Patch2: 0002-curl-7.31.0-abca89aa.patch
# patch making libcurl multilib ready
Patch101: 0101-curl-7.31.0-multilib.patch
@ -108,6 +111,7 @@ documentation of the library, too.
# upstream patches
%patch1 -p1
%patch2 -p1
# Fedora patches
%patch101 -p1
@ -229,6 +233,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/aclocal/libcurl.m4
%changelog
* Tue Jul 01 2013 Kamil Dudka <kdudka@redhat.com> 7.31.0-3
- restore the functionality of 'curl -u :'
* Wed Jun 26 2013 Kamil Dudka <kdudka@redhat.com> 7.31.0-2
- build the curl tool with metalink support