diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2017-12-20 18:58:21 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-12-20 18:58:21 +0000 |
| commit | 6db33596c8953d1f0c22027469939a09c2ec6c55 (patch) | |
| tree | d439cbca5e5a690085c6ec1d5ad638557740b042 | |
| parent | c6fb53288fdc5fadce23e8dd9107d78c7f1348e6 (diff) | |
| parent | aae00d53fb85eb5e1a4b768f0c353c4e5884baff (diff) | |
| download | external_curl-6db33596c8953d1f0c22027469939a09c2ec6c55.tar.gz external_curl-6db33596c8953d1f0c22027469939a09c2ec6c55.tar.bz2 external_curl-6db33596c8953d1f0c22027469939a09c2ec6c55.zip | |
Snap for 4511918 from aae00d53fb85eb5e1a4b768f0c353c4e5884baff to pi-release
Change-Id: I871c02830ad9862d0cd500ba34c1cad9616fa42b
| -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 f807e964..da59f54b 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 6ba8faca..4a0b8d3c 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 |