URL in secrets: only check port if present

This commit is contained in:
wbaumann 2009-06-05 19:49:20 +00:00
parent d26e7b68d6
commit 4c101585b0
2 changed files with 4 additions and 2 deletions

View File

@ -4,6 +4,8 @@ ChangeLog for davfs2
2009-06-05 Werner Baumann (werner.baumann@onlinehome.de) 2009-06-05 Werner Baumann (werner.baumann@onlinehome.de)
* wedav.c, dav_put: * wedav.c, dav_put:
Do HEAD if no etag returned (regression in 1.4.0). Do HEAD if no etag returned (regression in 1.4.0).
* mount_davfs.c, read_secrets:
For URLs only check port if present.


2009-05-31 Werner Baumann (werner.baumann@onlinehome.de) 2009-05-31 Werner Baumann (werner.baumann@onlinehome.de)
* cache.c, cache.h, dav_coda.c, dav_fuse.c: * cache.c, cache.h, dav_coda.c, dav_fuse.c:

View File

@ -2373,7 +2373,7 @@ read_secrets(dav_args *args, const char *filename)
|| (scheme && args->scheme || (scheme && args->scheme
&& strcmp(scheme, args->scheme) == 0 && strcmp(scheme, args->scheme) == 0
&& host && args->host && strcmp(host, args->host) == 0 && host && args->host && strcmp(host, args->host) == 0
&& port == args->port && (!port || port == args->port)
&& path && args->path && path && args->path
&& strcmp(path, args->path) == 0)) { && strcmp(path, args->path) == 0)) {


@ -2452,7 +2452,7 @@ read_secrets(dav_args *args, const char *filename)
The pointers to the components may be NULL. If they point to a non-NULL The pointers to the components may be NULL. If they point to a non-NULL
string, it is freed and then replaced by a newly allocated string. string, it is freed and then replaced by a newly allocated string.
If no scheme is foud the default sheme "http" is returned. If no scheme is foud the default sheme "http" is returned.
If no path is foud "/" is returned as path. path will always end with "/". If no path is found "/" is returned as path. path will always end with "/".
There is *no* default value returned for port. There is *no* default value returned for port.
return value : 0 on success, -1 otherwise. */ return value : 0 on success, -1 otherwise. */
static int static int