[svn-commits] tilghman: branch 1.6.0 r115020 - in /branches/1.6.0: ./ main/utils.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Thu May  1 14:01:06 2008
New Revision: 115020

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

................
r115018 | tilghman | 2008-05-01 14:00:18 -0500 (Thu, 01 May 2008) | 14 lines

Merged revisions 115017 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r115017 | tilghman | 2008-05-01 13:59:08 -0500 (Thu, 01 May 2008) | 6 lines

'#' is another reserved character for URIs that also needs to be escaped.
(closes issue #10543)
 Reported by: blitzrage
 Patches: 
       20080418__bug10543.diff.txt uploaded by Corydon76 (license 14)

........

................

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

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

Modified: branches/1.6.0/main/utils.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/utils.c?view=diff&rev=115020&r1=115019&r2=115020
==============================================================================
--- branches/1.6.0/main/utils.c (original)
+++ branches/1.6.0/main/utils.c Thu May  1 14:01:06 2008
@@ -441,7 +441,7 @@
 */
 char *ast_uri_encode(const char *string, char *outbuf, int buflen, int doreserved) 
 {
-	char *reserved = ";/?:@&=+$, ";	/* Reserved chars */
+	char *reserved = ";/?:@&=+$,# ";	/* Reserved chars */
 
  	const char *ptr  = string;	/* Start with the string */
 	char *out = NULL;