diff options
| author | Tobias Krause <tkr@openoffice.org> | 2010-01-26 07:44:10 +0100 |
|---|---|---|
| committer | Tobias Krause <tkr@openoffice.org> | 2010-01-26 07:44:10 +0100 |
| commit | 957e2c21ce86ec4539b2e825ef7eb6fce83d466c (patch) | |
| tree | 130016fb6c876dfaef144e6db36c27091f42b555 /ucb | |
| parent | ef897a6dec963a1a421db3628cead20ce3c96c90 (diff) | |
tkr32: #i105917# macos sdk 10.4 uses curl 7.13.1
Diffstat (limited to 'ucb')
| -rw-r--r-- | ucb/source/ucp/ftp/ftpcontent.cxx | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/ucb/source/ucp/ftp/ftpcontent.cxx b/ucb/source/ucp/ftp/ftpcontent.cxx index 77f20673cb2c..176e5275e645 100644 --- a/ucb/source/ucp/ftp/ftpcontent.cxx +++ b/ucb/source/ucp/ftp/ftpcontent.cxx @@ -578,22 +578,18 @@ Any SAL_CALL FTPContent::execute( else if(e.code() == CURLE_COULDNT_RESOLVE_HOST ) action = THROWRESOLVENAME; else if( e.code() == CURLE_FTP_USER_PASSWORD_INCORRECT || - e.code() == CURLE_FTP_WEIRD_PASS_REPLY || - e.code() == CURLE_LOGIN_DENIED) - action = THROWAUTHENTICATIONREQUEST; - else if(e.code() == CURLE_FTP_ACCESS_DENIED -// MacOS SDK 10.4 (curl 7.19.1) doesn't define CURLE_REMOTE_ACCESS_DENIED -#ifdef CURLE_REMOTE_ACCESS_DENIED - || e.code() == CURLE_REMOTE_ACCESS_DENIED +/* +MacOS SDK 10.4 uses curl 7.13.1 (current baseline). Curl introduced new error codes with this version. +*/ +#if LIBCURL_VERSION_NUM>=0x070d01 /* 7.13.1 */ + e.code() == CURLE_LOGIN_DENIED || #endif - ) + e.code() == CURLE_BAD_PASSWORD_ENTERED || + e.code() == CURLE_FTP_WEIRD_PASS_REPLY) + action = THROWAUTHENTICATIONREQUEST; + else if(e.code() == CURLE_FTP_ACCESS_DENIED) action = THROWACCESSDENIED; - else if(e.code() == CURLE_FTP_QUOTE_ERROR -// MacOS SDK 10.4 (curl 7.19.1) doesn't define CURLE_QUOTE_ERROR -#ifdef CURLE_QUOTE_ERROR - || e.code() == CURLE_QUOTE_ERROR -#endif - ) + else if(e.code() == CURLE_FTP_QUOTE_ERROR) action = THROWQUOTE; else if(e.code() == CURLE_FTP_COULDNT_RETR_FILE) action = THROWNOFILE; |