diff options
| author | Elliott Hughes <enh@google.com> | 2017-12-19 23:12:12 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-12-19 23:12:12 +0000 |
| commit | 10454ac0160379de136bacbd7919f97228e906e6 (patch) | |
| tree | d439cbca5e5a690085c6ec1d5ad638557740b042 | |
| parent | 0e597893586fa5c6dd748561959a454febf0ec76 (diff) | |
| parent | 8fe2ac76a9f9439dfbab31efc6c308588364e304 (diff) | |
| download | android_external_curl-10454ac0160379de136bacbd7919f97228e906e6.tar.gz android_external_curl-10454ac0160379de136bacbd7919f97228e906e6.tar.bz2 android_external_curl-10454ac0160379de136bacbd7919f97228e906e6.zip | |
Merge "Disable FTP and FTPS." am: 8725a20f04
am: 8fe2ac76a9
Change-Id: Id09ff513b227b50486375ffde0e21355f2b90a8f
| -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 |