]> granicus.if.org Git - curl/log
curl
5 years agourl: default conn->port to the same as conn->remote_port
Daniel Stenberg [Tue, 28 May 2019 14:17:51 +0000 (16:17 +0200)]
url: default conn->port to the same as conn->remote_port

... so that it has a sensible value when ConnectionExists() is called which
needs it set to differentiate host "bundles" correctly on port number!

Also, make conncache:hashkey() use correct port for bundles that are proxy vs
host connections.

Probably a regression from 7.62.0

Reported-by: Tom van der Woerdt
Fixes #3956
Closes #3957

5 years agoconncache: make "bundles" per host name when doing proxy tunnels
Daniel Stenberg [Tue, 28 May 2019 10:14:51 +0000 (12:14 +0200)]
conncache: make "bundles" per host name when doing proxy tunnels

Only HTTP proxy use where multiple host names can be used over the same
connection should use the proxy host name for bundles.

Reported-by: Tom van der Woerdt
Fixes #3951
Closes #3955

5 years agomulti: track users of a socket better
Daniel Stenberg [Tue, 28 May 2019 06:23:43 +0000 (08:23 +0200)]
multi: track users of a socket better

They need to be removed from the socket hash linked list with more care.

When sh_delentry() is called to remove a sockethash entry, remove all
individual transfers from the list first. To enable this, each Curl_easy struct
now stores a pointer to the sockethash entry to know how to remove itself.

Reported-by: Tom van der Woerdt and Kunal Ekawde
Fixes #3952
Fixes #3904
Closes #3953

5 years agocurl-win32.h: Enable Unix Domain Sockets based on the Windows SDK version
Steve Holme [Fri, 24 May 2019 06:02:06 +0000 (07:02 +0100)]
curl-win32.h: Enable Unix Domain Sockets based on the Windows SDK version

Microsoft added support for Unix Domain Sockets in Windows 10 1803
(RS4). Rather than expect the user to enable Unix Domain Sockets by
uncommenting the #define that was added in 0fd6221f we use the RS4
pre-processor variable that is present in newer versions of the
Windows SDK.

Closes #3939

5 years agocmake: support CMAKE_OSX_ARCHITECTURES when detecting SIZEOF variables
Jonas Vautherin [Sat, 25 May 2019 12:49:59 +0000 (14:49 +0200)]
cmake: support CMAKE_OSX_ARCHITECTURES when detecting SIZEOF variables

Closes #3945

5 years agoHAProxy tests: add keywords
Marcel Raad [Mon, 27 May 2019 11:42:05 +0000 (13:42 +0200)]
HAProxy tests: add keywords

Add the proxy and haproxy keywords in order to be able to exclude or
run these specific tests.

Closes https://github.com/curl/curl/pull/3949

5 years agotests: make test 1420 and 1406 work with rtsp-disabled libcurl
Maksim Stsepanenka [Sun, 26 May 2019 22:24:52 +0000 (01:24 +0300)]
tests: make test 1420 and 1406 work with rtsp-disabled libcurl

Closes #3948

5 years agonss: allow to specify TLS 1.3 ciphers if supported by NSS
Hubert Kario [Fri, 17 May 2019 17:15:24 +0000 (17:15 +0000)]
nss: allow to specify TLS 1.3 ciphers if supported by NSS

Closes #3916

5 years agoRELEASE-NOTES: synced
Daniel Stenberg [Sun, 26 May 2019 09:24:01 +0000 (11:24 +0200)]
RELEASE-NOTES: synced

5 years agoRevert all SASL authzid (new feature) commits
Jay Satiro [Fri, 24 May 2019 18:53:03 +0000 (14:53 -0400)]
Revert all SASL authzid (new feature) commits

- Revert all commits related to the SASL authzid feature since the next
  release will be a patch release, 7.65.1.

Prior to this change CURLOPT_SASL_AUTHZID  / --sasl-authzid was destined
for the next release, assuming it would be a feature release 7.66.0.
However instead the next release will be a patch release, 7.65.1 and
will not contain any new features.

After the patch release after the reverted commits can be restored by
using cherry-pick:

git cherry-pick a14d72c a9499ff 8c1cc36 c2a8d52 0edf690

Details for all reverted commits:

Revert "os400: take care of CURLOPT_SASL_AUTHZID in curl_easy_setopt_ccsid()."

This reverts commit 0edf6907ae37e2020722e6f61229d8ec64095b0a.

Revert "tests: Fix the line endings for the SASL alt-auth tests"

This reverts commit c2a8d52a1356a722ff9f4aeb983cd4eaf80ef221.

Revert "examples: Added SASL PLAIN authorisation identity (authzid) examples"

This reverts commit 8c1cc369d0c7163c6dcc91fd38edfea1f509ae75.

Revert "curl: --sasl-authzid added to support CURLOPT_SASL_AUTHZID from the tool"

This reverts commit a9499ff136d89987af885e2d7dff0a066a3e5817.

Revert "sasl: Implement SASL authorisation identity via CURLOPT_SASL_AUTHZID"

This reverts commit a14d72ca2fec5d4eb5a043936e4f7ce08015c177.

5 years agoFAQ: more minor updates and spelling fixes
dbrowndan [Thu, 23 May 2019 22:05:29 +0000 (15:05 -0700)]
FAQ: more minor updates and spelling fixes

Closes #3937

5 years agoRELEASE-NOTES: synced
Daniel Stenberg [Fri, 24 May 2019 10:50:01 +0000 (12:50 +0200)]
RELEASE-NOTES: synced

5 years agosectransp: handle errSSLPeerAuthCompleted from SSLRead()
Daniel Stenberg [Thu, 23 May 2019 15:16:02 +0000 (17:16 +0200)]
sectransp: handle errSSLPeerAuthCompleted from SSLRead()

Reported-by: smuellerDD on github
Fixes #3932
Closes #3933

5 years agoFix typo.
Gisle Vanem [Fri, 24 May 2019 07:05:28 +0000 (09:05 +0200)]
Fix typo.

5 years agotool_setopt: for builds with disabled-proxy, skip all proxy setopts()
Daniel Stenberg [Wed, 22 May 2019 21:25:43 +0000 (23:25 +0200)]
tool_setopt: for builds with disabled-proxy, skip all proxy setopts()

Reported-by: Marcel Raad
Fixes #3926
Closes #3929

5 years agowinbuild: Use two space indentation
Steve Holme [Tue, 14 May 2019 09:00:09 +0000 (10:00 +0100)]
winbuild: Use two space indentation

Closes #3930

5 years agotool_parse_cfg: Avoid 2 fopen() for WIN32
Gisle Vanem [Thu, 23 May 2019 15:13:39 +0000 (17:13 +0200)]
tool_parse_cfg: Avoid 2 fopen() for WIN32

Using the memdebug.h mem-leak feature, I noticed 2 calls like:
  FILE tool_parsecfg.c:70 fopen("c:\Users\Gisle\AppData\Roaming\_curlrc","rt")
  FILE tool_parsecfg.c:114 fopen("c:\Users\Gisle\AppData\Roaming\_curlrc","rt")

No need for 'fopen(), 'fclose()' and a 'fopen()' yet again.

5 years agomd4: include the mbedtls config.h to get the MD4 info
Daniel Stenberg [Wed, 22 May 2019 08:45:35 +0000 (10:45 +0200)]
md4: include the mbedtls config.h to get the MD4 info

5 years agomd4: build correctly with openssl without MD4
Daniel Stenberg [Wed, 22 May 2019 08:40:02 +0000 (10:40 +0200)]
md4: build correctly with openssl without MD4

Reported-by: elsamuko at github
Fixes #3921
Closes #3922

5 years agoos400: take care of CURLOPT_SASL_AUTHZID in curl_easy_setopt_ccsid().
Patrick Monnerat [Thu, 23 May 2019 11:24:53 +0000 (13:24 +0200)]
os400: take care of CURLOPT_SASL_AUTHZID in curl_easy_setopt_ccsid().

5 years ago.github/FUNDING: mention our opencollective "home" [ci skip]
Daniel Stenberg [Thu, 23 May 2019 09:15:19 +0000 (11:15 +0200)]
.github/FUNDING: mention our opencollective "home" [ci skip]

5 years agoconfig-win32: add support for if_nametoindex and getsockname
Zenju [Wed, 22 May 2019 09:11:36 +0000 (11:11 +0200)]
config-win32: add support for if_nametoindex and getsockname

Closes https://github.com/curl/curl/pull/3923

5 years agotests: Fix the line endings for the SASL alt-auth tests
Jay Satiro [Thu, 23 May 2019 08:01:09 +0000 (04:01 -0400)]
tests: Fix the line endings for the SASL alt-auth tests

- Change data and protocol sections to CRLF line endings.

Prior to this change the tests would fail or hang, which is because
certain sections such as protocol require CRLF line endings.

Follow-up to a9499ff from today which added the tests.

Ref: https://github.com/curl/curl/pull/3790

5 years agourl: fix bad #ifdef
Daniel Stenberg [Wed, 22 May 2019 11:28:22 +0000 (13:28 +0200)]
url: fix bad #ifdef

Regression since e91e48161235272ff485.

Reported-by: Tom Greenslade
Fixes #3924
Closes #3925

5 years agoRevert "progress: CURL_DISABLE_PROGRESS_METER"
Daniel Stenberg [Wed, 22 May 2019 21:15:34 +0000 (23:15 +0200)]
Revert "progress: CURL_DISABLE_PROGRESS_METER"

This reverts commit 3b06e68b7734cb10a555f9d7e804dd5d808236a4.

Clearly this change wasn't good enough as it broke CURLOPT_LOW_SPEED_LIMIT +
CURLOPT_LOW_SPEED_TIME

Reported-by: Dave Reisner
Fixes #3927
Closes #3928

5 years agoexamples: Added SASL PLAIN authorisation identity (authzid) examples
Steve Holme [Sun, 21 Apr 2019 22:29:57 +0000 (23:29 +0100)]
examples: Added SASL PLAIN authorisation identity (authzid) examples

5 years agocurl: --sasl-authzid added to support CURLOPT_SASL_AUTHZID from the tool
Steve Holme [Fri, 19 Apr 2019 13:26:47 +0000 (14:26 +0100)]
curl: --sasl-authzid added to support CURLOPT_SASL_AUTHZID from the tool

5 years agosasl: Implement SASL authorisation identity via CURLOPT_SASL_AUTHZID
Steve Holme [Wed, 17 Apr 2019 22:47:51 +0000 (23:47 +0100)]
sasl: Implement SASL authorisation identity via CURLOPT_SASL_AUTHZID

Added the ability for the calling program to specify the authorisation
identity (authzid), the identity to act as, in addition to the
authentication identity (authcid) and password when using SASL PLAIN
authentication.

Fixed #3653
Closes #3790

5 years agotests: add support to test against OpenSSH for Windows
Marc Hoersken [Mon, 19 Nov 2018 20:05:57 +0000 (21:05 +0100)]
tests: add support to test against OpenSSH for Windows

Testing against OpenSSH for Windows requires v7.7.0.0 or newer
due to the use of AllowUsers and DenyUsers. For more info see:
https://github.com/PowerShell/Win32-OpenSSH/wiki/sshd_config

5 years agobump: start on the next release
Daniel Stenberg [Wed, 22 May 2019 08:11:05 +0000 (10:11 +0200)]
bump: start on the next release

5 years agoexamples: fix "clarify calculation precedence" warnings
Marcel Raad [Tue, 21 May 2019 09:25:42 +0000 (11:25 +0200)]
examples: fix "clarify calculation precedence" warnings

Closes https://github.com/curl/curl/pull/3919

5 years agohiperfifo: remove unused variable
Marcel Raad [Tue, 21 May 2019 09:18:10 +0000 (11:18 +0200)]
hiperfifo: remove unused variable

Closes https://github.com/curl/curl/pull/3919

5 years agoexamples: remove dead variable stores
Marcel Raad [Tue, 21 May 2019 08:58:21 +0000 (10:58 +0200)]
examples: remove dead variable stores

Closes https://github.com/curl/curl/pull/3919

5 years agoexamples: reduce variable scopes
Marcel Raad [Tue, 21 May 2019 08:44:16 +0000 (10:44 +0200)]
examples: reduce variable scopes

Closes https://github.com/curl/curl/pull/3919

5 years agohttp2-download: fix format specifier
Marcel Raad [Tue, 21 May 2019 08:02:39 +0000 (10:02 +0200)]
http2-download: fix format specifier

Closes https://github.com/curl/curl/pull/3919

5 years agoPolarSSL: deprecate support step 1. Removed from configure.
Daniel Stenberg [Wed, 15 May 2019 11:57:16 +0000 (13:57 +0200)]
PolarSSL: deprecate support step 1. Removed from configure.

Also removed mentions from most docs.

Discussed: https://curl.haxx.se/mail/lib-2019-05/0045.html

Closes #3888

5 years agoconfigure/cmake: check for if_nametoindex()
Daniel Stenberg [Tue, 21 May 2019 14:47:53 +0000 (16:47 +0200)]
configure/cmake: check for if_nametoindex()

- adds the check to cmake

- fixes the configure check to work for cross-compiled windows builds

Closes #3917

5 years agoparse_proxy: use the IPv6 zone id if given
Daniel Stenberg [Tue, 21 May 2019 13:02:41 +0000 (15:02 +0200)]
parse_proxy: use the IPv6 zone id if given

If the proxy string is given as an IPv6 numerical address with a zone
id, make sure to use that for the connect to the proxy.

Reported-by: Edmond Yu
Fixes #3482
Closes #3918

5 years agoRELEASE-NOTES: 7.65.0 release curl-7_65_0
Daniel Stenberg [Wed, 22 May 2019 05:48:44 +0000 (07:48 +0200)]
RELEASE-NOTES: 7.65.0 release

5 years agoTHANKS: from the 7.65.0 release-notes
Daniel Stenberg [Wed, 22 May 2019 05:48:44 +0000 (07:48 +0200)]
THANKS: from the 7.65.0 release-notes

5 years agourl: convert the zone id from a IPv6 URL to correct scope id
Daniel Stenberg [Tue, 21 May 2019 07:43:10 +0000 (09:43 +0200)]
url: convert the zone id from a IPv6 URL to correct scope id

Reported-by: GitYuanQu on github
Fixes #3902
Closes #3914

5 years agoconfigure: detect getsockname and getpeername on windows too
Daniel Stenberg [Tue, 21 May 2019 08:06:06 +0000 (10:06 +0200)]
configure: detect getsockname and getpeername on windows too

Made detection macros for these two functions in the same style as other
functions possibly in winsock in the hope this will work better to
detect these functions when cross-compiling for Windows.

Follow-up to e91e4816123

Fixes #3913
Closes #3915

5 years agoexamples: remove unused variables
Marcel Raad [Mon, 20 May 2019 09:50:23 +0000 (11:50 +0200)]
examples: remove unused variables

Fixes Codacy/CppCheck warnings.

Closes

5 years agoudpateconninfo: mark variable unused
Daniel Gustafsson [Tue, 21 May 2019 07:42:22 +0000 (09:42 +0200)]
udpateconninfo: mark variable unused

When compiling without getpeername() or getsockname(), the sockfd
paramter to Curl_udpateconninfo() became unused after commit e91e481612
added ifdef guards.

Closes #3910
Fixes https://curl.haxx.se/dev/log.cgi?id=20190520172441-32196
Reviewed-by: Marcel Raad, Daniel Stenberg
5 years agoftp: move ftp_ccc in under featureflag
Daniel Gustafsson [Tue, 21 May 2019 07:38:11 +0000 (09:38 +0200)]
ftp: move ftp_ccc in under featureflag

Commit e91e48161235272ff485ff32bd048c53af731f43 moved ftp_ccc in under
the FTP featureflag in the UserDefined struct, but vtls callsites were
still using it unprotected.

Closes #3912
Fixes: https://curl.haxx.se/dev/log.cgi?id=20190520044705-29865
Reviewed-by: Daniel Stenberg, Marcel Raad
5 years agocurl: report error for "--no-" on non-boolean options
Daniel Stenberg [Mon, 20 May 2019 08:51:53 +0000 (10:51 +0200)]
curl: report error for "--no-" on non-boolean options

Reported-by: Olen Andoni
Fixes #3906
Closes #3907

5 years agombedtls: enable use of EC keys
Guy Poizat [Thu, 16 May 2019 09:54:26 +0000 (11:54 +0200)]
mbedtls: enable use of EC keys

Closes #3892

5 years agolib1560: add tests for parsing URL with too long scheme
Daniel Stenberg [Mon, 20 May 2019 08:00:27 +0000 (10:00 +0200)]
lib1560: add tests for parsing URL with too long scheme

Ref: #3905

5 years agourlapi: increase supported scheme length to 40 bytes
Omar Ramadan [Sat, 18 May 2019 23:48:00 +0000 (16:48 -0700)]
urlapi: increase supported scheme length to 40 bytes

The longest currently registered URI scheme at IANA is 36 bytes long.

Closes #3905
Closes #3900

5 years agolib: reduce variable scopes
Marcel Raad [Sat, 11 May 2019 19:42:48 +0000 (21:42 +0200)]
lib: reduce variable scopes

Fixes Codacy/CppCheck warnings.

Closes https://github.com/curl/curl/pull/3872

5 years agotool_formparse: remove redundant assignment
Marcel Raad [Sun, 12 May 2019 12:35:22 +0000 (14:35 +0200)]
tool_formparse: remove redundant assignment

Just initialize word_begin with the correct value.

Closes https://github.com/curl/curl/pull/3873

5 years agossh: move variable declaration to where it's used
Marcel Raad [Sun, 12 May 2019 12:30:03 +0000 (14:30 +0200)]
ssh: move variable declaration to where it's used

This way, we need only one call to free.

Closes https://github.com/curl/curl/pull/3873

5 years agossh-libssh: remove unused variable
Marcel Raad [Sun, 12 May 2019 12:27:53 +0000 (14:27 +0200)]
ssh-libssh: remove unused variable

sock was only used to be assigned to fd_read.

Closes https://github.com/curl/curl/pull/3873

5 years agotest332: verify the blksize fix
Daniel Stenberg [Fri, 3 May 2019 20:21:10 +0000 (22:21 +0200)]
test332: verify the blksize fix

5 years agotftp: use the current blksize for recvfrom()
Daniel Stenberg [Fri, 3 May 2019 20:20:37 +0000 (22:20 +0200)]
tftp: use the current blksize for recvfrom()

bug: https://curl.haxx.se/docs/CVE-2019-5436.html
Reported-by: l00p3r on hackerone
CVE-2019-5436

5 years agoversion: make ssl_version buffer match for multi_ssl
Daniel Gustafsson [Sun, 19 May 2019 20:06:26 +0000 (22:06 +0200)]
version: make ssl_version buffer match for multi_ssl

When running a multi TLS backend build the version string needs more
buffer space. Make the internal ssl_buffer stack buffer match the one
in Curl_multissl_version() to allow for the longer string. For single
TLS backend builds there is no use in extended to buffer. This is a
fallout from #3863 which fixes up the multi_ssl string generation to
avoid a buffer overflow when the buffer is too small.

Closes #3875
Reviewed-by: Daniel Stenberg <daniel@haxx.se>
5 years agohttp_ntlm_wb: Handle auth for only a single request
Steve Holme [Sat, 18 May 2019 16:30:16 +0000 (17:30 +0100)]
http_ntlm_wb: Handle auth for only a single request

Currently when the server responds with 401 on NTLM authenticated
connection (re-used) we consider it to have failed.  However this is
legitimate and may happen when for example IIS is set configured to
'authPersistSingleRequest' or when the request goes thru a proxy (with
'via' header).

Implemented by imploying an additional state once a connection is
re-used to indicate that if we receive 401 we need to restart
authentication.

Missed in fe6049f0.

5 years agohttp_ntlm_wb: Cleanup handshake after clean NTLM failure
Steve Holme [Sat, 18 May 2019 16:17:12 +0000 (17:17 +0100)]
http_ntlm_wb: Cleanup handshake after clean NTLM failure

Missed in 50b87c4e.

5 years agohttp_ntlm_wb: Return the correct error on receiving an empty auth message
Steve Holme [Sat, 18 May 2019 16:05:04 +0000 (17:05 +0100)]
http_ntlm_wb: Return the correct error on receiving an empty auth message

Missed in fe20826b as it wasn't implemented in http.c in b4d6db83.

Closes #3894

5 years agocurl: make code work with protocol-disabled libcurl
Daniel Stenberg [Tue, 14 May 2019 08:03:54 +0000 (10:03 +0200)]
curl: make code work with protocol-disabled libcurl

Closes #3844

5 years agolibcurl: #ifdef away more code for disabled features/protocols
Daniel Stenberg [Sun, 5 May 2019 15:08:22 +0000 (17:08 +0200)]
libcurl: #ifdef away more code for disabled features/protocols

5 years agoprogress: CURL_DISABLE_PROGRESS_METER
Daniel Stenberg [Sun, 5 May 2019 15:08:22 +0000 (17:08 +0200)]
progress: CURL_DISABLE_PROGRESS_METER

5 years agohostip: CURL_DISABLE_SHUFFLE_DNS
Daniel Stenberg [Sun, 5 May 2019 15:08:22 +0000 (17:08 +0200)]
hostip: CURL_DISABLE_SHUFFLE_DNS

5 years agonetrc: CURL_DISABLE_NETRC
Daniel Stenberg [Sun, 5 May 2019 15:08:22 +0000 (17:08 +0200)]
netrc: CURL_DISABLE_NETRC

5 years agodocs: Markdown and misc improvements [ci skip]
Viktor Szakats [Thu, 16 May 2019 22:11:27 +0000 (22:11 +0000)]
docs: Markdown and misc improvements [ci skip]

Approved-by: Daniel Stenberg
Closes #3896

5 years agodocs/RELEASE-PROCEDURE: link to live iCalendar [ci skip]
Viktor Szakats [Thu, 16 May 2019 18:56:42 +0000 (18:56 +0000)]
docs/RELEASE-PROCEDURE: link to live iCalendar [ci skip]

Ref: https://github.com/curl/curl/commit/0af41b40b2c7bd379b2251cbe7cd618e21fa0ea1#commitcomment-33563135
Approved-by: Daniel Stenberg
Closes #3895

5 years agotravis: add an osx http-only build
Daniel Stenberg [Wed, 15 May 2019 06:57:00 +0000 (08:57 +0200)]
travis: add an osx http-only build

Closes #3887

5 years agocleanup: remove FIXME and TODO comments
Daniel Stenberg [Tue, 14 May 2019 14:36:15 +0000 (16:36 +0200)]
cleanup: remove FIXME and TODO comments

They serve very little purpose and mostly just add noise. Most of them
have been around for a very long time. I read them all before removing
or rephrasing them.

Ref: #3876
Closes #3883

5 years agocurl: don't set FTP options for FTP-disabled builds
Daniel Stenberg [Wed, 15 May 2019 06:42:57 +0000 (08:42 +0200)]
curl: don't set FTP options for FTP-disabled builds

... since libcurl has started to be totally unaware of options for
disabled protocols they now return error.

Bug: https://github.com/curl/curl/commit/c9c5304dd4747cbe75d2f24be85920d572fcb5b8#commitcomment-33533937

Reported-by: Marcel Raad
Closes #3886

5 years agohttp_ntlm_wb: Move the type-2 message processing into a dedicated function
Steve Holme [Wed, 15 May 2019 15:10:56 +0000 (16:10 +0100)]
http_ntlm_wb: Move the type-2 message processing into a dedicated function

This brings the code inline with the other HTTP authentication mechanisms.

Closes #3890

5 years agoRELEASE-NOTES: synced
Daniel Stenberg [Wed, 15 May 2019 12:35:00 +0000 (14:35 +0200)]
RELEASE-NOTES: synced

5 years agodocs/RELEASE-PROCEDURE: updated coming releases dates [ci skip]
Daniel Stenberg [Wed, 15 May 2019 11:56:19 +0000 (13:56 +0200)]
docs/RELEASE-PROCEDURE: updated coming releases dates [ci skip]

5 years agoCURLOPT_READFUNCTION.3: see also CURLOPT_UPLOAD_BUFFERSIZE [ci skip]
Daniel Stenberg [Wed, 15 May 2019 10:05:49 +0000 (12:05 +0200)]
CURLOPT_READFUNCTION.3: see also CURLOPT_UPLOAD_BUFFERSIZE [ci skip]

Reported-by: Roy Bellingan
Bug: #3885

5 years agoparse_proxy: use the URL parser API
Daniel Stenberg [Sun, 12 May 2019 21:46:41 +0000 (23:46 +0200)]
parse_proxy: use the URL parser API

As we treat a given proxy as a URL we should use the unified URL parser
to extract the parts out of it.

Closes #3878

5 years agohttp_negotiate: Move the Negotiate state out of the negotiatedata structure
Steve Holme [Mon, 13 May 2019 20:42:35 +0000 (21:42 +0100)]
http_negotiate: Move the Negotiate state out of the negotiatedata structure

Given that this member variable is not used by the SASL based protocols
there is no need to have it here.

Closes #3882

5 years agohttp_ntlm: Move the NTLM state out of the ntlmdata structure
Steve Holme [Mon, 13 May 2019 19:58:39 +0000 (20:58 +0100)]
http_ntlm: Move the NTLM state out of the ntlmdata structure

Given that this member variable is not used by the SASL based protocols
there is no need to have it here.

5 years agourl: Move the negotiate state type into a dedicated enum
Steve Holme [Mon, 13 May 2019 19:29:40 +0000 (20:29 +0100)]
url: Move the negotiate state type into a dedicated enum

5 years agourl: Remove duplicate clean up of the winbind variables in conn_shutdown()
Steve Holme [Wed, 8 May 2019 10:36:08 +0000 (11:36 +0100)]
url: Remove duplicate clean up of the winbind variables in conn_shutdown()

Given that Curl_disconnect() calls Curl_http_auth_cleanup_ntlm() prior
to calling conn_shutdown() and it in turn performs this, there is no
need to perform the same action in conn_shutdown().

Closes #3881

5 years agourlapi: require a non-zero host name length when parsing URL
Daniel Stenberg [Mon, 13 May 2019 16:42:05 +0000 (18:42 +0200)]
urlapi: require a non-zero host name length when parsing URL

Updated test 1560 to verify.

Closes #3880

5 years agoconfigure: error out if OpenSSL wasn't detected when asked for
Daniel Stenberg [Thu, 2 May 2019 08:42:23 +0000 (10:42 +0200)]
configure: error out if OpenSSL wasn't detected when asked for

If --with-ssl is used and configure still couldn't enable SSL this
creates an error instead of just silently ignoring the fact.

Suggested-by: Isaiah Norton
Fixes #3824
Closes #3830

5 years agoimap: Fix typo in comment
Daniel Gustafsson [Tue, 14 May 2019 10:38:09 +0000 (12:38 +0200)]
imap: Fix typo in comment

5 years agourl: Remove unnecessary initialisation from allocate_conn()
Steve Holme [Wed, 8 May 2019 11:12:49 +0000 (12:12 +0100)]
url: Remove unnecessary initialisation from allocate_conn()

No need to set variables to zero as calloc() does this for us.

Closes #3879

5 years agoCURLOPT_CAINFO.3: with Schannel, you want Windows 8 or later [ci skip]
Daniel Stenberg [Sun, 12 May 2019 14:35:33 +0000 (16:35 +0200)]
CURLOPT_CAINFO.3: with Schannel, you want Windows 8 or later [ci skip]

Clues-provided-by: Jay Satiro
Clues-provided-by: Jeroen Ooms
Fixes #3711
Closes #3874

5 years agovtls: fix potential ssl_buffer stack overflow
Daniel Gustafsson [Mon, 13 May 2019 18:27:50 +0000 (20:27 +0200)]
vtls: fix potential ssl_buffer stack overflow

In Curl_multissl_version() it was possible to overflow the passed in
buffer if the generated version string exceeded the size of the buffer.
Fix by inverting the logic, and also make sure to not exceed the local
buffer during the string generation.

Closes #3863
Reported-by: nevv on HackerOne/curl
Reviewed-by: Jay Satiro
Reviewed-by: Daniel Stenberg
5 years agoRELEASE-NOTES: synced
Daniel Stenberg [Mon, 13 May 2019 17:23:36 +0000 (19:23 +0200)]
RELEASE-NOTES: synced

5 years agoappveyor: also build "/ci" branches like travis
Daniel Stenberg [Fri, 10 May 2019 13:52:57 +0000 (15:52 +0200)]
appveyor: also build "/ci" branches like travis

5 years agopingpong: disable more when no pingpong enabled
Daniel Stenberg [Sun, 5 May 2019 15:08:22 +0000 (17:08 +0200)]
pingpong: disable more when no pingpong enabled

5 years agoproxy: acknowledge DISABLE_PROXY more
Daniel Stenberg [Sun, 5 May 2019 15:08:22 +0000 (17:08 +0200)]
proxy: acknowledge DISABLE_PROXY more

5 years agoparsedate: CURL_DISABLE_PARSEDATE
Daniel Stenberg [Sun, 5 May 2019 15:08:21 +0000 (17:08 +0200)]
parsedate: CURL_DISABLE_PARSEDATE

5 years agosasl: only enable if there's a protocol enabled using it
Daniel Stenberg [Sun, 5 May 2019 15:08:21 +0000 (17:08 +0200)]
sasl: only enable if there's a protocol enabled using it

5 years agomime: acknowledge CURL_DISABLE_MIME
Daniel Stenberg [Sun, 5 May 2019 15:08:21 +0000 (17:08 +0200)]
mime: acknowledge CURL_DISABLE_MIME

5 years agowildcard: disable from build when FTP isn't present
Daniel Stenberg [Sun, 5 May 2019 15:08:21 +0000 (17:08 +0200)]
wildcard: disable from build when FTP isn't present

5 years agohttp: CURL_DISABLE_HTTP_AUTH
Daniel Stenberg [Sun, 5 May 2019 15:08:21 +0000 (17:08 +0200)]
http: CURL_DISABLE_HTTP_AUTH

5 years agobase64: build conditionally if there are users
Daniel Stenberg [Sun, 5 May 2019 15:08:21 +0000 (17:08 +0200)]
base64: build conditionally if there are users

5 years agodoh: CURL_DISABLE_DOH
Daniel Stenberg [Sun, 5 May 2019 15:08:21 +0000 (17:08 +0200)]
doh: CURL_DISABLE_DOH

5 years agoauth: Rename the various authentication clean up functions
Steve Holme [Sat, 11 May 2019 11:57:42 +0000 (12:57 +0100)]
auth: Rename the various authentication clean up functions

For consistency and to a avoid confusion.

Closes #3869

5 years agodocs/INSTALL: fix broken link [ci skip]
Jay Satiro [Sun, 12 May 2019 14:13:42 +0000 (16:13 +0200)]
docs/INSTALL: fix broken link [ci skip]

Reported-by: Joombalaya on github
Fixes #3818

5 years agoeasy: fix another "clarify calculation precedence" warning
Marcel Raad [Sun, 12 May 2019 11:36:45 +0000 (13:36 +0200)]
easy: fix another "clarify calculation precedence" warning

I missed this one in commit 6b3dde7fe62ea5a557fd1fd323fac2bcd0c2e9be.

5 years agobuild: fix "clarify calculation precedence" warnings
Marcel Raad [Sat, 11 May 2019 12:51:24 +0000 (14:51 +0200)]
build: fix "clarify calculation precedence" warnings

Codacy/CppCheck warns about this. Consistently use parentheses as we
already do in some places to silence the warning.

Closes https://github.com/curl/curl/pull/3866

5 years agocmake: restore C89 compatibility of CurlTests.c
Marcel Raad [Sat, 11 May 2019 20:02:39 +0000 (22:02 +0200)]
cmake: restore C89 compatibility of CurlTests.c

I broke it in d1b5cf830bfe169745721b21245d2217d2c2453e and
97de97daefc2ed084c91eff34af2426f2e55e134.

Reported-by: Viktor Szakats
Ref: https://github.com/curl/curl/commit/97de97daefc2ed084c91eff34af2426f2e55e134#commitcomment-33499044
Closes https://github.com/curl/curl/pull/3868