ucb/source/ucp/webdav-neon/NeonSession.cxx | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
New commits:
commit 19d61beb37f63e171f55f937c21dfb0d1422fd72
Author: Giuseppe Castagno <giuseppe.casta...@acca-esse.eu>
Date: Thu May 5 15:53:09 2016 +0200
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 <c...@libreoffice.org>
Reviewed-by: jan iversen <j...@documentfoundation.org>
(cherry picked from commit d324b4b3e1d32b25a6347f2f77ae921a584ee9b0)
Reviewed-on: https://gerrit.libreoffice.org/24714
Tested-by: jan iversen <j...@documentfoundation.org>
Reviewed-by: David Tardon <dtar...@redhat.com>
diff --git a/ucb/source/ucp/webdav-neon/NeonSession.cxx
b/ucb/source/ucp/webdav-neon/NeonSession.cxx
index 40889fe..3740e4a 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 );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
