Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: couchbaselabs/CouchCocoa
base: 78c20bd5cd
...
head fork: couchbaselabs/CouchCocoa
compare: 9a3ada3a40
Checking mergeability… Don't worry, you can still create the pull request.
  • 2 commits
  • 2 files changed
  • 0 commit comments
  • 1 contributor
Commits on Apr 11, 2012
@snej snej Fix build break (missing TDBase64.h)
Build was broken by previous commit 78c20bd.
Replace use of TDBase64 (which exists in Syncpoint but not the other branches) with RESTBase64.

Change-Id: Ic155d8e9761e244a8cdcc0a00982d1ad98ec8caa
863d676
@snej snej Make change tracker work with URLs without an explicit port
Use port 80 if _databaseURL.port is 0 (unspecified).
I have no idea why I have to keep making this fix over and over! Somehow it didn't make it into this branch of this class...

Change-Id: I109fa014c09bd2bc0bc51f549a53c2227f0d1ab0
9a3ada3
Showing with 3 additions and 3 deletions.
  1. +1 −1  Couch/CouchSocketChangeTracker.m
  2. +2 −2 REST/RESTResource.m
View
2  Couch/CouchSocketChangeTracker.m
@@ -61,7 +61,7 @@ - (BOOL) start {
_trackingOutput = (NSOutputStream*)cfOutputStream;
#else
[NSStream getStreamsToHost: [NSHost hostWithName: _databaseURL.host]
- port: _databaseURL.port.intValue
+ port: _databaseURL.port.intValue ?: 80
inputStream: &_trackingInput outputStream: &_trackingOutput];
if (!_trackingOutput)
return NO;
View
4 REST/RESTResource.m
@@ -17,7 +17,7 @@
#import "RESTInternal.h"
#import "RESTCache.h"
-#import "TDBase64.h"
+#import "RESTBase64.h"
@implementation RESTResource
@@ -170,7 +170,7 @@ - (NSMutableURLRequest*) requestWithMethod: (NSString*)method
NSString* password = [request.URL password];
if (username && password) {
NSString *creds = [NSString stringWithFormat:@"%@:%@", username, password];
- creds = [TDBase64 encode: [creds dataUsingEncoding:NSUTF8StringEncoding]];
+ creds = [RESTBase64 encode: [creds dataUsingEncoding:NSUTF8StringEncoding]];
[request addValue:[NSString stringWithFormat:@"Basic %@", creds] forHTTPHeaderField:@"Authorization"];
}

No commit comments for this range

Something went wrong with that request. Please try again.