gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-31 00:30:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix for bug 35437

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@34699 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2012-02-02 17:12:42 +00:00
parent 5272cb5ae8
commit d024ffcad9
3 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -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> 2012-01-31 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSJSONSerialization.m: bugfix for empty strings. * Source/NSJSONSerialization.m: bugfix for empty strings.

12
Source/NSURL.m
View file

@ -66,7 +66,7 @@ NSString * const NSErrorFailingURLStringKey = @"NSErrorFailingURLStringKey";
@implementation NSString (NSURLPrivate) @implementation NSString (NSURLPrivate)
/* Like the normal percent escape method, but with additional characters /* Like the normal percent escape method, but with additional characters
* escaped. * escaped (for use by file scheme URLs).
*/ */
- (NSString*) _stringByAddingPercentEscapes - (NSString*) _stringByAddingPercentEscapes
{ {
@ -708,7 +708,15 @@ static NSUInteger urlAlign;
{ {
NSString *aUrlString = [NSString alloc]; NSString *aUrlString = [NSString alloc];
aPath = [aPath _stringByAddingPercentEscapes]; if ([aScheme isEqualToString: @"file"])
{
aPath = [aPath _stringByAddingPercentEscapes];
}
else
{
aPath = [aPath
stringByAddingPercentEscapesUsingEncoding: NSUTF8StringEncoding];
}
if ([aHost length] > 0) if ([aHost length] > 0)
{ {
NSRange r = [aHost rangeOfString: @"@"]; NSRange r = [aHost rangeOfString: @"@"];

4
Version
View file

@ -6,10 +6,10 @@ GCC_VERSION=4.0.0
# The version number of this release. # The version number of this release.
MAJOR_VERSION=1 MAJOR_VERSION=1
MINOR_VERSION=23 MINOR_VERSION=24
SUBMINOR_VERSION=0 SUBMINOR_VERSION=0
# numeric value should match above # numeric value should match above
VERSION_NUMBER=123.0 VERSION_NUMBER=124.0
GNUSTEP_BASE_VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${SUBMINOR_VERSION} GNUSTEP_BASE_VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${SUBMINOR_VERSION}
VERSION=${GNUSTEP_BASE_VERSION} VERSION=${GNUSTEP_BASE_VERSION}