From dda0dfc1408e137e11055fec43a7022a1c028aae Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 8 Dec 2021 19:56:20 +0100 Subject: [PATCH] lib/curl/Request: move code from SetupEasy() to Setup.cxx --- src/lib/curl/Request.cxx | 15 ++---------- src/lib/curl/Setup.cxx | 51 ++++++++++++++++++++++++++++++++++++++++ src/lib/curl/Setup.hxx | 39 ++++++++++++++++++++++++++++++ src/lib/curl/meson.build | 1 + 4 files changed, 93 insertions(+), 13 deletions(-) create mode 100644 src/lib/curl/Setup.cxx create mode 100644 src/lib/curl/Setup.hxx diff --git a/src/lib/curl/Request.cxx b/src/lib/curl/Request.cxx index 7cdd10b12a..a5c30dd341 100644 --- a/src/lib/curl/Request.cxx +++ b/src/lib/curl/Request.cxx @@ -27,19 +27,15 @@ * OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" #include "Request.hxx" +#include "Setup.hxx" #include "Global.hxx" #include "event/Call.hxx" -#include "util/StringStrip.hxx" -#include "Version.h" #include #include -#include - CurlRequest::CurlRequest(CurlGlobal &_global, CurlEasy _easy, CurlResponseHandler &_handler) :global(_global), handler(_handler), easy(std::move(_easy)) @@ -66,14 +62,7 @@ CurlRequest::SetupEasy() handler.Install(easy); - easy.SetUserAgent("Music Player Daemon " VERSION); -#if !defined(ANDROID) && !defined(_WIN32) - easy.SetOption(CURLOPT_NETRC, 1L); -#endif - easy.SetNoProgress(); - easy.SetNoSignal(); - easy.SetConnectTimeout(10); - easy.SetOption(CURLOPT_HTTPAUTH, (long) CURLAUTH_ANY); + Curl::Setup(easy); } void diff --git a/src/lib/curl/Setup.cxx b/src/lib/curl/Setup.cxx new file mode 100644 index 0000000000..284b7ca794 --- /dev/null +++ b/src/lib/curl/Setup.cxx @@ -0,0 +1,51 @@ +/* + * Copyright 2008-2021 Max Kellermann + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include "Setup.hxx" +#include "Easy.hxx" +#include "Version.h" + +#include + +namespace Curl { + +void +Setup(CurlEasy &easy) +{ + easy.SetUserAgent("Music Player Daemon " VERSION); +#if !defined(ANDROID) && !defined(_WIN32) + easy.SetOption(CURLOPT_NETRC, 1L); +#endif + easy.SetNoProgress(); + easy.SetNoSignal(); + easy.SetConnectTimeout(10); + easy.SetOption(CURLOPT_HTTPAUTH, (long) CURLAUTH_ANY); +} + +} // namespace Curl diff --git a/src/lib/curl/Setup.hxx b/src/lib/curl/Setup.hxx new file mode 100644 index 0000000000..8937d89244 --- /dev/null +++ b/src/lib/curl/Setup.hxx @@ -0,0 +1,39 @@ +/* + * Copyright 2008-2021 Max Kellermann + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#pragma once + +class CurlEasy; + +namespace Curl { + +void +Setup(CurlEasy &easy); + +} // namespace Curl diff --git a/src/lib/curl/meson.build b/src/lib/curl/meson.build index 284c688d86..a0f9647fb7 100644 --- a/src/lib/curl/meson.build +++ b/src/lib/curl/meson.build @@ -18,6 +18,7 @@ curl = static_library( 'Init.cxx', 'Global.cxx', 'Request.cxx', + 'Setup.cxx', 'Adapter.cxx', 'Escape.cxx', 'Form.cxx',