From 08825e893bb41d260b3d7f3132ed5487bd9b23c1 Mon Sep 17 00:00:00 2001
From: "nick.kreeger%park.edu"
 <nick.kreeger%park.edu@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Mon, 10 Jul 2006 17:36:19 +0000
Subject: [PATCH] Fixing bug 341846, Don't encode fwd-slash when doing keyword
 substitution. patch by froodian <stridey@gmail.com>, r=chris lawson, hwaara,
 sr=pink.

git-svn-id: svn://10.0.0.236/trunk@201821 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/camino/src/bookmarks/BookmarkFolder.mm        | 2 +-
 mozilla/camino/src/browser/BrowserWindowController.mm | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mozilla/camino/src/bookmarks/BookmarkFolder.mm b/mozilla/camino/src/bookmarks/BookmarkFolder.mm
index c237690d6a6..1241c270cf4 100644
--- a/mozilla/camino/src/bookmarks/BookmarkFolder.mm
+++ b/mozilla/camino/src/bookmarks/BookmarkFolder.mm
@@ -1020,7 +1020,7 @@ static int BookmarkItemSort(id firstItem, id secondItem, void* context)
                                                                                  (CFStringRef)searchString, 
                                                                                  NULL, 
                                                                                  // legal URL characters that should be encoded in search terms
-                                                                                 CFSTR(";/?:@&=+$,"),
+                                                                                 CFSTR(";?:@&=+$,"),
                                                                                  kCFStringEncodingUTF8) autorelease];
     NSString* resultString = [NSString stringWithFormat:@"%@%@%@",
       [url substringToIndex:matchRange.location],
diff --git a/mozilla/camino/src/browser/BrowserWindowController.mm b/mozilla/camino/src/browser/BrowserWindowController.mm
index 74bda3e3ebf..4b2ce3c8e52 100644
--- a/mozilla/camino/src/browser/BrowserWindowController.mm
+++ b/mozilla/camino/src/browser/BrowserWindowController.mm
@@ -2166,7 +2166,7 @@ enum BWCOpenDest {
     
     // Escape the search string so the user can search for strings with
     // special characters ("&", "+", etc.) List from RFC2396.
-    NSString *escapedSearchString = (NSString *) CFURLCreateStringByAddingPercentEscapes(NULL, (CFStringRef)searchString, NULL, CFSTR(";/?:@&=+$,"), kCFStringEncodingUTF8);
+    NSString *escapedSearchString = (NSString *) CFURLCreateStringByAddingPercentEscapes(NULL, (CFStringRef)searchString, NULL, CFSTR(";?:@&=+$,"), kCFStringEncodingUTF8);
     
     // replace the conversion specifiers (%d, %s) in the search string
     [self transformFormatString:searchURL domain:aDomain search:escapedSearchString];