ooo-build r11661 - in trunk: . patches/src680

[jholesovsky svn gnome org]

Author: jholesovsky
Date: Thu Feb 21 13:40:02 2008
New Revision: 11661
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11661&view=rev

Log:
2008-02-21  Jan Holesovsky  <kendy suse cz>

        * patches/src680/webdav-locking-can-have-username.diff,
          patches/src680/apply: The http(s)/dav(s)/webdav(s) protocols can
          contain even username/passwd.


Added:
   trunk/patches/src680/webdav-locking-can-have-username.diff
Modified:
   trunk/ChangeLog
   trunk/patches/src680/apply

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Thu Feb 21 13:40:02 2008
@@ -588,6 +588,9 @@
 # Catch possible exceptions in flush(), otherwise can crash
 webdav-locking-catch-flush-exceptions.diff, n#363093, i#29152, jholesov
 
+# The http(s)/dav(s)/webdav(s) protocols can contain even username/passwd
+webdav-locking-can-have-username.diff, n#363363, i#29152, jholesov
+
 [ GnomeVFS < ooh680-m4 ]
 # WebDAV locking
 # It is in this section because it needs part of the gvfs-related patches

Added: trunk/patches/src680/webdav-locking-can-have-username.diff
==============================================================================
--- (empty file)
+++ trunk/patches/src680/webdav-locking-can-have-username.diff	Thu Feb 21 13:40:02 2008
@@ -0,0 +1,48 @@
+diff --git tools/source/fsys/urlobj.cxx tools/source/fsys/urlobj.cxx
+index b5a51f9..c4e37c4 100644
+--- tools/source/fsys/urlobj.cxx
++++ tools/source/fsys/urlobj.cxx
+@@ -404,21 +404,21 @@ static INetURLObject::SchemeInfo const aSchemeInfoMap[INET_PROT_END]
+ 		  false },
+ 		{ "ftp", "ftp://";, 21, true, true, false, true, true, true, true,
+ 		  false },
+-		{ "http", "http://";, 80, true, false, false, false, true, true,
++		{ "http", "http://";, 80, true, true, false, true, true, true,
+ 		  true, true },
+ 		{ "file", "file://", 0, true, false, false, false, true, false,
+ 		  true, false },
+ 		{ "mailto", "mailto:";, 0, false, false, false, false, false,
+ 		  false, false, true },
+-		{ "vnd.sun.star.webdav", "vnd.sun.star.webdav://", 80, true, false,
+-		  false, false, true, true, true, true },
++		{ "vnd.sun.star.webdav", "vnd.sun.star.webdav://", 80, true, true,
++		  false, true, true, true, true, true },
+ 		{ "news", "news:";, 0, false, false, false, false, false, false, false,
+           false },
+ 		{ "private", "private:", 0, false, false, false, false, false,
+ 		  false, false, true },
+ 		{ "vnd.sun.star.help", "vnd.sun.star.help://", 0, true, false, false,
+ 		  false, false, false, true, true },
+-		{ "https", "https://";, 443, true, false, false, false, true, true,
++		{ "https", "https://";, 443, true, true, false, true, true, true,
+ 		  true, true },
+ 		{ "slot", "slot:", 0, false, false, false, false, false, false,
+ 		  false, true },
+@@ -464,13 +464,13 @@ static INetURLObject::SchemeInfo const aSchemeInfoMap[INET_PROT_END]
+           false, false, false, true, false },
+         { "smb", "smb://", 139, true, true, false, true, true, true, true,
+           true },
+-        { "dav", "dav://", 80, true, false, false, false, true, true, true,
++        { "dav", "dav://", 80, true, true, false, true, true, true, true,
+           true },
+-        { "davs", "davs://", 443, true, false, false, false, true, true,
++        { "davs", "davs://", 443, true, true, false, true, true, true,
+           true, true },
+-        { "webdav", "webdav://", 80, true, false, false, false, true, true, true,
++        { "webdav", "webdav://", 80, true, true, false, true, true, true, true,
+           true },
+-        { "webdavs", "webdavs://", 443, true, false, false, false, true, true,
++        { "webdavs", "webdavs://", 443, true, true, false, true, true, true,
+           true, true },
+         { "", "", 0, false, false, false, false, false, false, false, false },
+         { "", "", 0, false, false, false, false, false, false, true, false }