diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2004-12-23 08:41:08 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2004-12-23 08:41:08 +0000 |
| commit | f0c4269b48e99959b467b83c158737c9e43eea91 (patch) | |
| tree | e87451d977bb61addd467142b21ef1a30b11f636 /ucb/source/ucp/ftp/ftploaderthread.cxx | |
| parent | acc8d933362724484a2f05f7a78f9522f6906c76 (diff) | |
INTEGRATION: CWS kso12 (1.4.208); FILE MERGED
2004/12/07 15:33:27 kso 1.4.208.1: #i35323# - Adapted to curl 7.12.2
Diffstat (limited to 'ucb/source/ucp/ftp/ftploaderthread.cxx')
| -rw-r--r-- | ucb/source/ucp/ftp/ftploaderthread.cxx | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/ucb/source/ucp/ftp/ftploaderthread.cxx b/ucb/source/ucp/ftp/ftploaderthread.cxx index 90d023dc9533..6dec4dd2203d 100644 --- a/ucb/source/ucp/ftp/ftploaderthread.cxx +++ b/ucb/source/ucp/ftp/ftploaderthread.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ftploaderthread.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: abi $ $Date: 2002-08-28 07:23:13 $ + * last change: $Author: vg $ $Date: 2004-12-23 09:41:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -58,7 +58,6 @@ * * ************************************************************************/ - /************************************************************************** TODO ************************************************************************** @@ -87,8 +86,18 @@ using namespace ftp; extern "C" { #endif + int memory_write_dummy(void *buffer,size_t size,size_t nmemb,void *stream) + { + return 0; + } + void delete_CURL(void *pData) { + // Otherwise response for QUIT will be sent to already destroyed + // MemoryContainer via non-dummy memory_write function. + curl_easy_setopt(static_cast<CURL*>(pData), + CURLOPT_HEADERFUNCTION, + memory_write_dummy); curl_easy_cleanup(static_cast<CURL*>(pData)); } |