diff options
| author | Giuseppe Castagno <giuseppe.castagno@acca-esse.eu> | 2016-05-05 15:53:09 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2016-05-09 07:20:07 +0000 |
| commit | 19d61beb37f63e171f55f937c21dfb0d1422fd72 (patch) | |
| tree | c383935f9f648c1e27ca89e263439edb06d23831 | |
| parent | f538ff6272bf8f9264ebd5c8d97d712831f301d1 (diff) | |
tdf#99246 Use correct path for lock in PUT method.
Changed the tdf#, on master it's the wrong one unfortunately.
Change-Id: I2091024a601bebede5d2fb8596dda1054ca4ef3b
Reviewed-on: https://gerrit.libreoffice.org/24691
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: jan iversen <jani@documentfoundation.org>
(cherry picked from commit d324b4b3e1d32b25a6347f2f77ae921a584ee9b0)
Reviewed-on: https://gerrit.libreoffice.org/24714
Tested-by: jan iversen <jani@documentfoundation.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
| -rw-r--r-- | ucb/source/ucp/webdav-neon/NeonSession.cxx | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/ucb/source/ucp/webdav-neon/NeonSession.cxx b/ucb/source/ucp/webdav-neon/NeonSession.cxx index 40889feb4acc..3740e4a2a0b3 100644 --- a/ucb/source/ucp/webdav-neon/NeonSession.cxx +++ b/ucb/source/ucp/webdav-neon/NeonSession.cxx @@ -1895,7 +1895,13 @@ int NeonSession::PUT( ne_session * sess, ne_request * req = ne_request_create( sess, "PUT", uri ); int ret; - ne_lock_using_resource( req, uri, 0 ); + // tdf#99246 + // extract the path of uri + // ne_lock_using_resource below compares path, ignores all the rest. + // in case of Web proxy active, this function uri parameter is instead absolute + ne_uri aUri; + ne_uri_parse( uri, &aUri ); + ne_lock_using_resource( req, aUri.path, 0 ); ne_lock_using_parent( req, uri ); ne_set_request_body_buffer( req, buffer, size ); |