From d024ffcad9ec2804e9d4300e13c124301913d726 Mon Sep 17 00:00:00 2001
From: rfm <rfm@72102866-910b-0410-8b05-ffd578937521>
Date: Thu, 2 Feb 2012 17:12:42 +0000
Subject: [PATCH] fix for bug 35437

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@34699 72102866-910b-0410-8b05-ffd578937521
---
 ChangeLog      |  4 ++++
 Source/NSURL.m | 12 ++++++++++--
 Version        |  4 ++--
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0228134bf..5e059aecd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-02-03  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/NSURL.m: Fixup for bug #35437
+
 2012-01-31  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/NSJSONSerialization.m: bugfix for empty strings.
diff --git a/Source/NSURL.m b/Source/NSURL.m
index 19173ba5c..a08bf440c 100644
--- a/Source/NSURL.m
+++ b/Source/NSURL.m
@@ -66,7 +66,7 @@ NSString * const NSErrorFailingURLStringKey = @"NSErrorFailingURLStringKey";
 @implementation	NSString (NSURLPrivate)
 
 /* Like the normal percent escape method, but with additional characters
- * escaped.
+ * escaped (for use by file scheme URLs).
  */
 - (NSString*) _stringByAddingPercentEscapes
 {
@@ -708,7 +708,15 @@ static NSUInteger	urlAlign;
 {
   NSString	*aUrlString = [NSString alloc];
 
-  aPath = [aPath _stringByAddingPercentEscapes];
+  if ([aScheme isEqualToString: @"file"])
+    {
+      aPath = [aPath _stringByAddingPercentEscapes];
+    }
+  else
+    {
+      aPath = [aPath
+	stringByAddingPercentEscapesUsingEncoding: NSUTF8StringEncoding];
+    }
   if ([aHost length] > 0)
     {
       NSRange	r = [aHost rangeOfString: @"@"];
diff --git a/Version b/Version
index 7e3eea0bf..14b11f6b9 100644
--- a/Version
+++ b/Version
@@ -6,10 +6,10 @@ GCC_VERSION=4.0.0
 
 # The version number of this release.
 MAJOR_VERSION=1
-MINOR_VERSION=23
+MINOR_VERSION=24
 SUBMINOR_VERSION=0
 # numeric value should match above
-VERSION_NUMBER=123.0
+VERSION_NUMBER=124.0
 GNUSTEP_BASE_VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${SUBMINOR_VERSION}
 VERSION=${GNUSTEP_BASE_VERSION}