From ccf23e71918d2af7ad9d261a2b012836cd168d60 Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Fri, 3 Oct 2014 20:47:34 +0200 Subject: some curl fixes --- src/libcrawler/SpoolRewindInputStream.cpp | 7 +++++-- src/modules/fetcher/libcurl/LibCurlRewindInputStream.cpp | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/libcrawler/SpoolRewindInputStream.cpp b/src/libcrawler/SpoolRewindInputStream.cpp index 472a539..7108cc9 100644 --- a/src/libcrawler/SpoolRewindInputStream.cpp +++ b/src/libcrawler/SpoolRewindInputStream.cpp @@ -36,6 +36,9 @@ spool_streambuf::~spool_streambuf( ) streambuf::int_type spool_streambuf::spoolSourceData( char *data, size_t n ) { + m_base = &m_buf.front( ); + m_start = m_base; + size_t data_len = m_buf.size( ) - ( m_start - m_base ) ; // more space than data, no problem @@ -44,10 +47,10 @@ streambuf::int_type spool_streambuf::spoolSourceData( char *data, size_t n ) } // enough space in the stream read buffer, put it there - m_base = &m_buf.front( ); - m_start = m_base; + memcpy( m_start, data, data_len ); setg( m_base, m_start, m_start + data_len ); + data += data_len; n -= data_len; spoolData( data, n ); diff --git a/src/modules/fetcher/libcurl/LibCurlRewindInputStream.cpp b/src/modules/fetcher/libcurl/LibCurlRewindInputStream.cpp index 19098e8..1b80ce5 100644 --- a/src/modules/fetcher/libcurl/LibCurlRewindInputStream.cpp +++ b/src/modules/fetcher/libcurl/LibCurlRewindInputStream.cpp @@ -56,8 +56,8 @@ LibCurlRewindInputStream::LibCurlRewindInputStream( const URL &url ) m_curl->setOpt( Options::Url( url.str( ).c_str( ) ) ); // how to use logger here? - m_curl->setOpt( Options::Header( true ) ); - m_curl->setOpt( Options::Verbose( true ) ); +// m_curl->setOpt( Options::Header( true ) ); +// m_curl->setOpt( Options::Verbose( true ) ); /* m_curl->set( DebugFunction( types::DebugFunctionFunctor( & request.setOpt(Verbose(true)); request.setOpt(DebugFunction(curlpp::types::DebugFunctionFunctor(&myWindow, -- cgit v1.2.3-54-g00ecf