[asterisk-commits] twilson: branch 1.6.0 r112034 - in /branches/1.6.0: ./ main/http.c

[SVN commits to the Asterisk project]

Author: twilson
Date: Mon Mar 31 15:55:40 2008
New Revision: 112034

URL: http://svn.digium.com/view/asterisk?view=rev&rev=112034
Log:
Merged revisions 112033 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r112033 | twilson | 2008-03-31 15:45:05 -0500 (Mon, 31 Mar 2008) | 2 lines

Handle blank prefix= in http.conf

........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/http.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/main/http.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/http.c?view=diff&rev=112034&r1=112033&r2=112034
==============================================================================
--- branches/1.6.0/main/http.c (original)
+++ branches/1.6.0/main/http.c Mon Mar 31 15:55:40 2008
@@ -616,9 +616,9 @@
 	if (redirect)
 		goto cleanup;
 
-	/* We want requests to start with the prefix and '/' */
+	/* We want requests to start with the (optional) prefix and '/' */
 	l = strlen(prefix);
-	if (l && !strncasecmp(uri, prefix, l) && uri[l] == '/') {
+	if (!strncasecmp(uri, prefix, l) && uri[l] == '/') {
 		uri += l + 1;
 		/* scan registered uris to see if we match one. */
 		AST_RWLIST_RDLOCK(&uris);