head	1.5;
access;
symbols
	pkgsrc-2013Q2:1.2.0.2
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2013Q1:1.1.0.2
	pkgsrc-2013Q1-base:1.1;
locks; strict;
comment	@ * @;


1.5
date	2026.05.15.12.32.20;	author kikadf;	state Exp;
branches;
next	1.4;
commitid	3vZ7ZJs4qFbKnUFG;

1.4
date	2015.08.17.15.43.27;	author wiz;	state dead;
branches;
next	1.3;
commitid	uDVMctsQGhwXzDxy;

1.3
date	2015.08.08.02.44.16;	author spz;	state Exp;
branches;
next	1.2;
commitid	tdbBF0XGueHhypwy;

1.2
date	2013.04.14.16.39.49;	author wiz;	state dead;
branches;
next	1.1;

1.1
date	2013.03.10.13.21.05;	author obache;	state Exp;
branches;
next	;


desc
@@


1.5
log
@
curl: apply patch to fix wakeup consumption
@
text
@$NetBSD$

* Apply upstream commit to fix high cpu usage
  https://github.com/curl/curl/commit/2a2104f3cff44bb28bb570a093be52bbeeed8f23

--- lib/multi.c.orig	2026-05-15 14:06:57.225055741 +0200
+++ lib/multi.c
@@@@ -2479,6 +2479,11 @@@@ static CURLMcode multi_runsingle(struct 
   Curl_uint32_bset_remove(&multi->dirty, data->mid);
 
   if(data == multi->admin) {
+#ifdef ENABLE_WAKEUP
+    /* Consume any pending wakeup signals before processing.
+     * This is necessary for event based processing. See #21547 */
+    (void)Curl_wakeup_consume(multi->wakeup_pair, TRUE);
+#endif
 #ifdef USE_RESOLV_THREADED
     Curl_async_thrdd_multi_process(multi);
 #endif
@


1.4
log
@Update to 7.44.0:

Curl and libcurl 7.44.0

 Public curl releases:         148
 Command line options:         176
 curl_easy_setopt() options:   219
 Public functions in libcurl:  58
 Contributors:                 1291

This release includes the following changes:

 o http2: added CURLMOPT_PUSHFUNCTION and CURLMOPT_PUSHDATA [6]
 o examples: added http2-serverpush.c [7]
 o http2: added curl_pushheader_byname() and curl_pushheader_bynum()
 o docs: added CODE_OF_CONDUCT.md [8]
 o curl: Add --ssl-no-revoke to disable certificate revocation checks [5]
 o libcurl: New value CURLSSLOPT_NO_REVOKE for CURLOPT_SSL_OPTIONS [9]
 o makefile: Added support for VC14
 o build: Added Visual Studio 2015 (VC14) project files
 o build: Added wolfSSL configurations to VC10+ project files [18]

This release includes the following bugfixes:

 o FTP: fix HTTP CONNECT logic regression [1]
 o openssl: Fix build with openssl < ~ 0.9.8f
 o openssl: fix build with BoringSSL
 o curl_easy_setopt.3: option order doesn't matter
 o openssl: fix use of uninitialized buffer [2]
 o RTSP: removed dead code
 o Makefile.m32: add support for CURL_LDFLAG_EXTRAS
 o curl: always provide negotiate/kerberos options
 o cookie: Fix bug in export if any-domain cookie is present
 o curl_easy_setopt.3: mention CURLOPT_PIPEWAIT
 o INSTALL: Advise use of non-native SSL for Windows <= XP
 o tool_help: fix --tlsv1 help text to use >= for TLSv1
 o HTTP: POSTFIELDSIZE set after added to multi handle [3]
 o SSL-PROBLEMS: mention WinSSL problems in WinXP
 o setup-vms.h: Symbol case fixups
 o SSL: Pinned public key hash support
 o libtest: call PR_Cleanup() on exit if NSPR is used
 o ntlm_wb: Fix theoretical memory leak
 o runtests: Allow for spaces in curl custom path
 o http2: add stream != NULL checks for reliability
 o schannel: Replace deprecated GetVersion with VerifyVersionInfo
 o http2: verify success of strchr() in http2_send()
 o configure: add --disable-rt option
 o openssl: work around MSVC warning
 o HTTP: ignore "Content-Encoding: compress"
 o configure: check if OpenSSL linking wants -ldl
 o build-openssl.bat: Show syntax if required args are missing
 o test1902: attempt to make the test more reliable
 o libcurl-thread.3: Consolidate thread safety info
 o maketgz: Fixed some VC makefiles missing from the release tarball
 o libcurl-multi.3: mention curl_multi_wait [10]
 o ABI doc: use secure URL
 o http: move HTTP/2 cleanup code off http_disconnect() [11]
 o libcurl-thread.3: Warn memory functions must be thread safe [12]
 o curl_global_init_mem.3: Warn threaded resolver needs thread safe funcs [13]
 o docs: formpost needs the full size at start of upload [14]
 o curl_gssapi: remove 'const' to fix compiler warnings
 o SSH: three state machine fixups [15]
 o libcurl.3: fix a single typo [16]
 o generate.bat: Only clean prerequisite files when in ALL mode
 o curl_slist_append.3: add error checking to the example
 o buildconf.bat: Added support for file clean-up via -clean
 o generate.bat: Use buildconf.bat for prerequisite file clean-up
 o NTLM: handle auth for only a single request [17]
 o curl_multi_remove_handle.3: fix formatting [19]
 o checksrc.bat: Fixed error when [directory] isn't a curl source directory
 o checksrc.bat: Fixed error when missing *.c and *.h files
 o CURLOPT_RESOLVE.3: Note removal support was added in 7.42 [20]
 o test46: update cookie expire time
 o SFTP: fix range request off-by-one in size check [21]
 o CMake: fix GSSAPI builds [22]
 o build: refer to fixed libidn versions [4]
 o http2: discard frames with no SessionHandle [23]
 o curl_easy_recv.3: fix formatting
 o libcurl-tutorial.3: fix formatting [24]
 o curl_formget.3: correct return code [25]
@
text
@d1 1
a1 1
$NetBSD: patch-lib_multi.c,v 1.3 2015/08/08 02:44:16 spz Exp $
d3 2
a4 4
part of
https://github.com/bagder/curl/commit/903b6e05565bf826b4194447864288642214b094
fixing
http://curl.haxx.se/mail/lib-2015-06/0122.html
d6 1
a6 1
--- lib/multi.c.orig	2015-06-15 21:14:25.000000000 +0000
d8 2
a9 3
@@@@ -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;
d11 9
a19 8
-  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. */
@


1.3
log
@reanimate curl-7.43.0 and add the upstream fix for
http://curl.haxx.se/mail/lib-2015-06/0122.html found in
https://github.com/bagder/curl/commit/903b6e05565bf826b4194447864288642214b094
@
text
@d1 1
a1 1
$NetBSD$
@


1.2
log
@Update to 7.30.0:

Fixed in 7.30.0 - April 12 2013
Release contains security-related bug fix

Changes:

    imap: Changed response tag generation to be completely unique
    imap: Added support for SASL-IR extension
    imap: Added support for the list command
    imap: Added support for the append command
    imap: Added custom request parsing
    imap: Added support to the fetch command for UID and SECTION properties
    imap: Added parsing and verification of the UIDVALIDITY mailbox attribute
    darwinssl: Make certificate errors less techy
    imap/pop3/smtp: Added support for the STARTTLS capability
    checksrc: ban use of sprintf, vsprintf, strcat, strncat and gets
    curl_global_init() now accepts the CURL_GLOBAL_ACK_EINTR flag
    Added CURLMOPT_MAX_HOST_CONNECTIONS, CURLMOPT_MAX_TOTAL_CONNECTIONS for new multi interface connection handling
    Added CURLMOPT_MAX_PIPELINE_LENGTH, CURLMOPT_CONTENT_LENGTH_PENALTY_SIZE, CURLMOPT_CHUNK_LENGTH_PENALTY_SIZE, CURLMOPT_PIPELINING_SITE_BL and CURLMOPT_PIPELI NING_SERVER_BL for new pipelining control

Bugfixes:

    SECURITY ADVISORY: cookie tailmatching to avoid cross-domain leakage
    darwinssl: Fix build under Leopard
    DONE: consider callback-aborted transfers premature
    ntlm: Fixed memory leaks
    smtp: Fixed an issue when processing EHLO failure responses
    pop3: Fixed incorrect return value from pop3_endofresp()
    pop3: Fixed SASL authentication capability detection
    pop3: Fixed blocking SSL connect when connecting via POP3S
    imap: Fixed memory leak when performing multiple selects
    nss: fix misplaced code enabling non-blocking socket mode
    AddFormData: prevent only directories from being posted
    darwinssl: fix infinite loop if server disconnected abruptly
    metalink: fix improbable crash parsing metalink filename
    show proper host name on failed resolve
    MacOSX-Framework: Make script work in Xcode 4.0 and later
    strlcat: remove function
    darwinssl: Fix send glitchiness with data > 32 or so KB
    polarssl: better 1.1.x and 1.2.x support
    various documentation improvements
    multi: NULL pointer reference when closing an unused multi handle
    SOCKS: fix socks proxy when noproxy matched
    install-sh: updated to support multiple source files as arguments
    PolarSSL: added human readable error strings
    resolver_error: remove wrong error message output
    docs: updates HTML index and general improvements
    curlbuild.h.dist: enhance non-configure GCC ABI detection logic
    sasl: Fixed null pointer reference when decoding empty digest challenge
    easy: do not ignore poll() failures other than EINTR
    darwinssl: disable ECC ciphers under Mountain Lion by default
    CONNECT: count received headers
    build: fixes for VMS
    CONNECT: clear 'rewindaftersend' on success
    HTTP proxy: insert slash in URL if missing
    hiperfifo: updated to use current libevent API
    getinmemory.c: abort the transfer nicely if not enough memory
    improved win32 memorytracking
    corrected proxy header response headers count
    FTP quote operations on re-used connection
    tcpkeepalive on win32
    tcpkeepalive on Mac OS X
    easy: acknowledge the CURLOPT_MAXCONNECTS option properly
    easy interface: restore default MAXCONNECTS to 5
    win32: don't set SO_SNDBUF for windows vista or later versions
    HTTP: made cookie sort function more deterministic
    winssl: Fixed memory leak if connection was not successful
    FTP: wait on both connections during active STOR state
    connect: treat a failed local bind of an interface as a non-fatal error
    darwinssl: disable insecure ciphers by default
    FTP: handle "rubbish" in front of directory name in 257 responses
    mk-ca-bundle: Fixed lost OpenSSL output with "-t"
@
text
@d1 1
a1 1
$NetBSD: patch-lib_multi.c,v 1.1 2013/03/10 13:21:05 obache Exp $
d3 4
a6 2
Fix NULL pointer reference when closing an unused multi handle.
(upstream commit da3fc1ee91de656a30f3a12de394bcba55119872)
d8 1
a8 1
--- lib/multi.c.orig	2013-02-05 22:01:40.000000000 +0000
d10 3
a12 3
@@@@ -1773,10 +1773,12 @@@@ CURLMcode curl_multi_cleanup(CURLM *mult
     /* Close all the connections in the connection cache */
     close_all_connections(multi);
d14 8
a21 12
-    multi->closure_handle->dns.hostcache = multi->hostcache;
-    Curl_hostcache_clean(multi->closure_handle);
+    if(multi->closure_handle) {
+      multi->closure_handle->dns.hostcache = multi->hostcache;
+      Curl_hostcache_clean(multi->closure_handle);
 
-    Curl_close(multi->closure_handle);
+      Curl_close(multi->closure_handle);
+    }
     multi->closure_handle = NULL;
 
     Curl_hash_destroy(multi->sockhash);
@


1.1
log
@Fix NULL pointer reference when closing an unused multi handle.
(upstream commit da3fc1ee91de656a30f3a12de394bcba55119872)

PR pkg/47610 by dieter roelants

Bump PKGREVISION.
@
text
@d1 1
a1 1
$NetBSD$
@