diff --git a/NEWS b/NEWS
index fda62ae2..13e18fb1 100644
--- a/NEWS
+++ b/NEWS
@@ -58,6 +58,7 @@ NEWS
   * Add SSL Client Certificate verification (#1288)
   * mod_fastcgi: Fix host->active_procs counter, return 503 if connect wasn't successful after 5 tries (fixes #1825)
   * mod_accesslog: escape special characters (fixes #1551, thx icy)
+  * fix mod_webdav crash from #1793 (fixes #2048, thx hiroya)
 
 - 1.4.23 - 2009-06-19
   * Added some extra warning options in cmake and fix the resulting warnings (unused/static functions)
diff --git a/src/mod_webdav.c b/src/mod_webdav.c
index d73185cf..4b119966 100644
--- a/src/mod_webdav.c
+++ b/src/mod_webdav.c
@@ -1841,7 +1841,7 @@ URIHANDLER_FUNC(mod_webdav_subrequest_handler) {
 			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;
 		}