--- mod_webdav.c.org	2009-10-12 02:20:57.000000000 +0900
+++ mod_webdav.c	2009-10-17 01:42:54.000000000 +0900
@@ -1841,7 +1841,7 @@
			con->http_status = 400;
			return HANDLER_FINISHED;
		}
-		if (NULL != (sep2 = strchr(start, '@'))) {
+		if (NULL != (sep2 = memchr(start, '@', sep - start))) {
			/* skip login information */
			start = sep2 + 1;
		}