svn commit: r390806 - in head/ftp/curl: . files
Sunpoet Po-Chuan Hsieh
sunpoet at FreeBSD.org
Sun Jun 28 17:53:56 UTC 2015
Author: sunpoet
Date: Sun Jun 28 17:53:55 2015
New Revision: 390806
URL: https://svnweb.freebsd.org/changeset/ports/390806
Log:
- Fix multi handles
- Bump PORTREVISION for package change
PR: 201147
Submitted by: grembo
Obtained from: https://github.com/bagder/curl/commit/903b6e05565bf826b4194447864288642214b094
Added:
head/ftp/curl/files/patch-lib-multi.c (contents, props changed)
head/ftp/curl/files/patch-lib-transfer.c (contents, props changed)
Modified:
head/ftp/curl/Makefile
Modified: head/ftp/curl/Makefile
==============================================================================
--- head/ftp/curl/Makefile Sun Jun 28 17:53:31 2015 (r390805)
+++ head/ftp/curl/Makefile Sun Jun 28 17:53:55 2015 (r390806)
@@ -3,7 +3,7 @@
PORTNAME= curl
PORTVERSION= 7.43.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= ftp www
MASTER_SITES= http://curl.haxx.se/download/ \
LOCAL/sunpoet
Added: head/ftp/curl/files/patch-lib-multi.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/ftp/curl/files/patch-lib-multi.c Sun Jun 28 17:53:55 2015 (r390806)
@@ -0,0 +1,16 @@
+Obtained from: https://github.com/bagder/curl/commit/903b6e05565bf826b4194447864288642214b094
+
+--- lib/multi.c.orig 2015-06-15 21:14:25 UTC
++++ lib/multi.c
+@@ -402,11 +402,6 @@ CURLMcode curl_multi_add_handle(CURLM *m
+ /* Point to the multi's connection cache */
+ data->state.conn_cache = &multi->conn_cache;
+
+- if(data->set.httpreq == HTTPREQ_PUT)
+- data->state.infilesize = data->set.filesize;
+- else
+- data->state.infilesize = data->set.postfieldsize;
+-
+ /* This adds the new entry at the 'end' of the doubly-linked circular
+ list of SessionHandle structs to try and maintain a FIFO queue so
+ the pipelined requests are in order. */
Added: head/ftp/curl/files/patch-lib-transfer.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/ftp/curl/files/patch-lib-transfer.c Sun Jun 28 17:53:55 2015 (r390806)
@@ -0,0 +1,16 @@
+Obtained from: https://github.com/bagder/curl/commit/903b6e05565bf826b4194447864288642214b094
+
+--- lib/transfer.c.orig 2015-06-14 21:31:01 UTC
++++ lib/transfer.c
+@@ -1315,6 +1315,11 @@ CURLcode Curl_pretransfer(struct Session
+ Curl_safefree(data->info.wouldredirect);
+ data->info.wouldredirect = NULL;
+
++ if(data->set.httpreq == HTTPREQ_PUT)
++ data->state.infilesize = data->set.filesize;
++ else
++ data->state.infilesize = data->set.postfieldsize;
++
+ /* If there is a list of cookie files to read, do it now! */
+ if(data->change.cookielist)
+ Curl_cookie_loadfiles(data);
More information about the svn-ports-all
mailing list