diff options
| author | Alex Deymo <deymo@google.com> | 2017-12-19 14:16:42 +0100 |
|---|---|---|
| committer | Alex Deymo <deymo@google.com> | 2017-12-19 14:16:42 +0100 |
| commit | 251844e0e0f71b9270e7cbb063e8de158518092f (patch) | |
| tree | d439cbca5e5a690085c6ec1d5ad638557740b042 | |
| parent | 7d91b4f63bd1fd29c11c9ff1ba6e7c42622e0687 (diff) | |
| download | android_external_curl-251844e0e0f71b9270e7cbb063e8de158518092f.tar.gz android_external_curl-251844e0e0f71b9270e7cbb063e8de158518092f.tar.bz2 android_external_curl-251844e0e0f71b9270e7cbb063e8de158518092f.zip | |
Disable FTP and FTPS.
We don't use FTP or FTPS either, so no need to compile support for FTP.
Bug: 70741465
Test: Applied update over HTTP. 'curl' command failed to fetch ftp:// URI.
Change-Id: Iea4e5278e269c094f4cc86353a36ac9572c7f3b2
| -rwxr-xr-x | androidconfigure | 4 | ||||
| -rw-r--r-- | lib/curl_config.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/androidconfigure b/androidconfigure index f807e96..da59f54 100755 --- a/androidconfigure +++ b/androidconfigure @@ -55,6 +55,9 @@ CONFIGURE_ARGS=( --disable-smb --disable-gopher + # Disable FTP and FTPS support. + --disable-ftp + # Disable LDAP and LDAPS support. --disable-ldap --disable-ldaps @@ -74,7 +77,6 @@ CONFIGURE_ARGS=( ### Enable HTTP, FTP and FILE explicitly. These are enabled by default but # listed here as documentation. --enable-http - --enable-ftp --enable-file --enable-proxy diff --git a/lib/curl_config.h b/lib/curl_config.h index 6ba8fac..4a0b8d3 100644 --- a/lib/curl_config.h +++ b/lib/curl_config.h @@ -23,7 +23,7 @@ /* #undef CURL_DISABLE_FILE */ /* to disable FTP */ -/* #undef CURL_DISABLE_FTP */ +#define CURL_DISABLE_FTP 1 /* to disable Gopher */ #define CURL_DISABLE_GOPHER 1 |