This commit is contained in:
OBS User unknown
Git OBS Bridge
parent
faa86beb30
commit
b33e2e9f57
@ -1,137 +0,0 @@
|
||||
Index: lib/escape.c
|
||||
===================================================================
|
||||
RCS file: /cvsroot/curl/curl/lib/escape.c,v
|
||||
retrieving revision 1.40
|
||||
retrieving revision 1.41
|
||||
diff -u -p -r1.40 -r1.41
|
||||
--- lib/escape.c 26 Aug 2007 05:53:26 -0000 1.40
|
||||
+++ lib/escape.c 30 Sep 2007 22:40:24 -0000 1.41
|
||||
@@ -5,7 +5,7 @@
|
||||
* | (__| |_| | _ <| |___
|
||||
* \___|\___/|_| \_\_____|
|
||||
*
|
||||
- * Copyright (C) 1998 - 2006, Daniel Stenberg, <daniel@haxx.se>, et al.
|
||||
+ * Copyright (C) 1998 - 2007, Daniel Stenberg, <daniel@haxx.se>, et al.
|
||||
*
|
||||
* This software is licensed as described in the file COPYING, which
|
||||
* you should have received as part of this distribution. The terms
|
||||
@@ -18,7 +18,7 @@
|
||||
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
||||
* KIND, either express or implied.
|
||||
*
|
||||
- * $Id: escape.c,v 1.40 2007-08-26 05:53:26 danf Exp $
|
||||
+ * $Id: escape.c,v 1.41 2007-09-30 22:40:24 bagder Exp $
|
||||
***************************************************************************/
|
||||
|
||||
/* Escape and unescape URL encoding in strings. The functions return a new
|
||||
@@ -59,7 +59,7 @@ char *curl_easy_escape(CURL *handle, con
|
||||
size_t alloc = (inlength?(size_t)inlength:strlen(string))+1;
|
||||
char *ns;
|
||||
char *testing_ptr = NULL;
|
||||
- char in;
|
||||
+ unsigned char in; /* we need to treat the characters unsigned */
|
||||
size_t newlen = alloc;
|
||||
int strindex=0;
|
||||
size_t length;
|
||||
Index: lib/http.c
|
||||
===================================================================
|
||||
RCS file: /cvsroot/curl/curl/lib/http.c,v
|
||||
retrieving revision 1.334
|
||||
retrieving revision 1.335
|
||||
diff -u -p -r1.334 -r1.335
|
||||
--- lib/http.c 27 Aug 2007 06:31:28 -0000 1.334
|
||||
+++ lib/http.c 15 Sep 2007 21:14:13 -0000 1.335
|
||||
@@ -18,7 +18,7 @@
|
||||
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
||||
* KIND, either express or implied.
|
||||
*
|
||||
- * $Id: http.c,v 1.334 2007-08-27 06:31:28 danf Exp $
|
||||
+ * $Id: http.c,v 1.335 2007-09-15 21:14:13 bagder Exp $
|
||||
***************************************************************************/
|
||||
|
||||
#include "setup.h"
|
||||
@@ -1740,6 +1740,7 @@ CURLcode Curl_http(struct connectdata *c
|
||||
CURLcode result=CURLE_OK;
|
||||
struct HTTP *http;
|
||||
char *ppath = data->reqdata.path;
|
||||
+ char ftp_typecode[sizeof(";type=?")] = "";
|
||||
char *host = conn->host.name;
|
||||
const char *te = ""; /* transfer-encoding */
|
||||
char *ptr;
|
||||
@@ -1950,6 +1951,23 @@ CURLcode Curl_http(struct connectdata *c
|
||||
}
|
||||
}
|
||||
ppath = data->change.url;
|
||||
+ /* when doing ftp, append ;type=<a|i> if not present */
|
||||
+ if (checkprefix("ftp://", ppath) || checkprefix("ftps://", ppath)) {
|
||||
+ char *p = strstr(ppath, ";type=");
|
||||
+ if (p && p[6] && p[7] == 0) {
|
||||
+ switch (toupper(p[6])) {
|
||||
+ case 'A':
|
||||
+ case 'D':
|
||||
+ case 'I':
|
||||
+ break;
|
||||
+ default:
|
||||
+ p = NULL;
|
||||
+ }
|
||||
+ }
|
||||
+ if (!p)
|
||||
+ snprintf(ftp_typecode, sizeof(ftp_typecode), ";type=%c",
|
||||
+ data->set.prefer_ascii ? 'a' : 'i');
|
||||
+ }
|
||||
}
|
||||
if(HTTPREQ_POST_FORM == httpreq) {
|
||||
/* we must build the whole darned post sequence first, so that we have
|
||||
@@ -2093,7 +2111,7 @@ CURLcode Curl_http(struct connectdata *c
|
||||
result =
|
||||
add_bufferf(req_buffer,
|
||||
"%s " /* GET/HEAD/POST/PUT */
|
||||
- "%s HTTP/%s\r\n" /* path + HTTP version */
|
||||
+ "%s%s HTTP/%s\r\n" /* path + HTTP version */
|
||||
"%s" /* proxyuserpwd */
|
||||
"%s" /* userpwd */
|
||||
"%s" /* range */
|
||||
@@ -2108,6 +2126,7 @@ CURLcode Curl_http(struct connectdata *c
|
||||
|
||||
request,
|
||||
ppath,
|
||||
+ ftp_typecode,
|
||||
httpstring,
|
||||
conn->allocptr.proxyuserpwd?
|
||||
conn->allocptr.proxyuserpwd:"",
|
||||
Index: tests/data/test79
|
||||
===================================================================
|
||||
RCS file: /cvsroot/curl/curl/tests/data/test79,v
|
||||
retrieving revision 1.9
|
||||
retrieving revision 1.11
|
||||
diff -u -p -r1.9 -r1.11
|
||||
--- tests/data/test79 9 Mar 2007 21:01:40 -0000 1.9
|
||||
+++ tests/data/test79 15 Sep 2007 21:14:13 -0000 1.11
|
||||
@@ -45,8 +45,8 @@ ftp://%HOSTIP:%HTTPPORT/we/want/that/pag
|
||||
^User-Agent:.*
|
||||
</strip>
|
||||
<protocol>
|
||||
-GET ftp://127.0.0.1:%HTTPPORT/we/want/that/page/79 HTTP/1.1
|
||||
-Host: 127.0.0.1:%HTTPPORT
|
||||
+GET ftp://%HOSTIP:%HTTPPORT/we/want/that/page/79;type=i HTTP/1.1
|
||||
+Host: %HOSTIP:%HTTPPORT
|
||||
Pragma: no-cache
|
||||
Accept: */*
|
||||
Proxy-Connection: Keep-Alive
|
||||
Index: tests/data/test208
|
||||
===================================================================
|
||||
RCS file: /cvsroot/curl/curl/tests/data/test208,v
|
||||
retrieving revision 1.5
|
||||
retrieving revision 1.6
|
||||
diff -u -p -r1.5 -r1.6
|
||||
--- tests/data/test208 9 Mar 2007 21:01:40 -0000 1.5
|
||||
+++ tests/data/test208 15 Sep 2007 21:14:13 -0000 1.6
|
||||
@@ -44,7 +44,7 @@ the
|
||||
^User-Agent:.*
|
||||
</strip>
|
||||
<protocol>
|
||||
-PUT ftp://daniel:mysecret@host.com/we/want/208 HTTP/1.1
|
||||
+PUT ftp://daniel:mysecret@host.com/we/want/208;type=i HTTP/1.1
|
||||
Authorization: Basic ZGFuaWVsOm15c2VjcmV0
|
||||
Host: host.com:21
|
||||
Pragma: no-cache
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:3aabf85ef56afeddd66c7180971fbd6412133d85311a76b7a274f80982301cc3
|
||||
size 1698728
|
||||
3
curl-7.17.1.tar.bz2
Normal file
3
curl-7.17.1.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:7f668ec49506ffc968a54fde9404183212bb40b226626e9417d941594e06e57b
|
||||
size 1721551
|
||||
19
curl.changes
19
curl.changes
@ -1,3 +1,22 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Oct 30 09:14:04 CET 2007 - mmarek@suse.cz
|
||||
|
||||
- updated to 7.17.1
|
||||
* automatically append ";type=<a|i>" when using HTTP proxies for
|
||||
FTP urls [#306272]
|
||||
* improved NSS support
|
||||
* added --proxy-negotiate
|
||||
* added --post301 and CURLOPT_POST301
|
||||
* builds with c-ares 1.5.0
|
||||
* added CURLOPT_SSH_HOST_PUBLIC_KEY_MD5 and --hostpubmd5
|
||||
* renamed CURLE_SSL_PEER_CERTIFICATE to
|
||||
CURLE_PEER_FAILED_VERIFICATION
|
||||
* added CURLOPT_OPENSOCKETFUNCTION and CURLOPT_OPENSOCKETDATA
|
||||
* CULROPT_COOKIELIST supports "FLUSH"
|
||||
* added CURLOPT_COPYPOSTFIELDS
|
||||
* added --static-libs to curl-config
|
||||
* many bugfixes, inc. fix for bug #332917
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Oct 11 16:19:56 CEST 2007 - mszeredi@suse.de
|
||||
|
||||
|
||||
24
curl.spec
24
curl.spec
@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package curl (Version 7.17.0)
|
||||
# spec file for package curl (Version 7.17.1)
|
||||
#
|
||||
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# This file and all modifications and additions to the pristine
|
||||
@ -12,15 +12,14 @@
|
||||
|
||||
Name: curl
|
||||
BuildRequires: libidn-devel libopenssl-devel openldap2-devel zlib-devel
|
||||
Version: 7.17.0
|
||||
Release: 3
|
||||
Version: 7.17.1
|
||||
Release: 1
|
||||
AutoReqProv: on
|
||||
License: BSD 3-Clause; X11/MIT
|
||||
Group: Productivity/Networking/Web/Utilities
|
||||
Summary: A Tool for Transferring Data from URLs
|
||||
Url: http://curl.haxx.se/
|
||||
Source: curl-%{version}.tar.bz2
|
||||
Patch0: curl-7.17.0-cvs-fixes.patch
|
||||
Patch2: curl-ipv6tests.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
@ -85,7 +84,6 @@ Authors:
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0
|
||||
%patch2
|
||||
|
||||
%build
|
||||
@ -157,6 +155,22 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%doc %{_mandir}/man1/curl-config.1.gz
|
||||
%doc %{_mandir}/man3/*
|
||||
%changelog
|
||||
* Tue Oct 30 2007 - mmarek@suse.cz
|
||||
- updated to 7.17.1
|
||||
* automatically append ";type=<a|i>" when using HTTP proxies for
|
||||
FTP urls [#306272]
|
||||
* improved NSS support
|
||||
* added --proxy-negotiate
|
||||
* added --post301 and CURLOPT_POST301
|
||||
* builds with c-ares 1.5.0
|
||||
* added CURLOPT_SSH_HOST_PUBLIC_KEY_MD5 and --hostpubmd5
|
||||
* renamed CURLE_SSL_PEER_CERTIFICATE to
|
||||
CURLE_PEER_FAILED_VERIFICATION
|
||||
* added CURLOPT_OPENSOCKETFUNCTION and CURLOPT_OPENSOCKETDATA
|
||||
* CULROPT_COOKIELIST supports "FLUSH"
|
||||
* added CURLOPT_COPYPOSTFIELDS
|
||||
* added --static-libs to curl-config
|
||||
* many bugfixes, inc. fix for bug #332917
|
||||
* Thu Oct 11 2007 - mszeredi@suse.de
|
||||
- Add missing dependency (openldap2-devel) for libcurl-devel
|
||||
* Mon Oct 08 2007 - mmarek@suse.cz
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user