summaryrefslogtreecommitdiff
path: root/ucb
diff options
context:
space:
mode:
authorKai Sommerfeld <kso@openoffice.org>2009-11-27 13:48:22 +0100
committerKai Sommerfeld <kso@openoffice.org>2009-11-27 13:48:22 +0100
commit86948be8f2238cac7b28e4304836185a9e4163fd (patch)
treec3a8d8231ba74c00c243e204adfe5b08ecf6783b /ucb
parent7b87c2090387ec482cca1b496235d60bdf4683bd (diff)
#i107150# - new: Ability to handle compressed (gzip) responses.
Diffstat (limited to 'ucb')
-rw-r--r--ucb/source/ucp/webdav/NeonSession.cxx7
-rw-r--r--ucb/source/ucp/webdav/makefile.mk9
2 files changed, 9 insertions, 7 deletions
diff --git a/ucb/source/ucp/webdav/NeonSession.cxx b/ucb/source/ucp/webdav/NeonSession.cxx
index 59471c6cf0c1..bf08771ba7ce 100644
--- a/ucb/source/ucp/webdav/NeonSession.cxx
+++ b/ucb/source/ucp/webdav/NeonSession.cxx
@@ -40,6 +40,7 @@
#include <ne_auth.h>
#include <ne_redirect.h>
#include <ne_ssl.h>
+#include <ne_compress.h>
#include "libxml/parser.h"
#include "rtl/ustrbuf.hxx"
#include "comphelper/sequence.hxx"
@@ -1949,7 +1950,8 @@ int NeonSession::GET( ne_session * sess,
ne_add_response_header_catcher(
req, runResponseHeaderHandler, userdata );
#endif
- ne_add_response_body_reader( req, ne_accept_2xx, reader, userdata );
+ ne_decompress * dc
+ = ne_decompress_reader( req, ne_accept_2xx, reader, userdata );
ret = ne_request_dispatch( req );
@@ -1969,6 +1971,9 @@ int NeonSession::GET( ne_session * sess,
if ( ret == NE_OK && ne_get_status( req )->klass != 2 )
ret = NE_ERROR;
+ if ( dc != 0 )
+ ne_decompress_destroy(dc);
+
ne_request_destroy( req );
return ret;
}
diff --git a/ucb/source/ucp/webdav/makefile.mk b/ucb/source/ucp/webdav/makefile.mk
index 1b4265a74559..9756327c416f 100644
--- a/ucb/source/ucp/webdav/makefile.mk
+++ b/ucb/source/ucp/webdav/makefile.mk
@@ -1,7 +1,7 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+#
# Copyright 2008 by Sun Microsystems, Inc.
#
# OpenOffice.org - a multi-platform office productivity suite
@@ -127,9 +127,8 @@ SHL1STDLIBS=\
$(UCBHELPERLIB) \
$(COMPHELPERLIB) \
$(NEON3RDLIB) \
- $(LIBXML2LIB)
-
-
+ $(LIBXML2LIB) \
+ $(ZLIB3RDLIB)
.IF "$(GUI)"=="WNT"
SHL1STDLIBS+= $(WSOCK32LIB)
@@ -151,8 +150,6 @@ SHL1STDLIBS+= $(OPENSSLLIBST)
.ENDIF
.ENDIF # WNT
-
-
SHL1DEF=$(MISC)$/$(SHL1TARGET).def
SHL1LIBS=$(LIB1TARGET)