Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

added URLEncoding to S3 requests

  • Loading branch information...
commit 1f037b3a9ccf9224388c4e18b6ca317fa5459ceb 1 parent a2f0a43
@nrj authored
View
6 English.lproj/MainMenu.xib
@@ -1300,7 +1300,7 @@
<object class="NSTextFieldCell" key="NSCell" id="18424731">
<int key="NSCellFlags">-1804468671</int>
<int key="NSCellFlags2">272761856</int>
- <string key="NSContents">/Users/nrj/Desktop/test-empty-folder.zip</string>
+ <string key="NSContents">/Users/nrj/Music/iTunes/iTunes Music/Cake</string>
<reference key="NSSupport" ref="26"/>
<reference key="NSControlView" ref="889008429"/>
<bool key="NSDrawsBackground">YES</bool>
@@ -3727,9 +3727,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{656, 376}, {486, 188}}</string>
+ <string>{{504, 393}, {486, 188}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{656, 376}, {486, 188}}</string>
+ <string>{{504, 393}, {486, 188}}</string>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
View
34 extras/NSString+URLEncoding.h
@@ -0,0 +1,34 @@
+//
+// NSString+URLEncoding.h
+//
+// Created by Jon Crosby on 10/19/07.
+// Copyright 2007 Kaboomerang LLC. All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+
+#import <Foundation/Foundation.h>
+
+
+@interface NSString (OAURLEncodingAdditions)
+
+- (NSString *)encodedURLString;
+- (NSString *)encodedURLParameterString;
+
+@end
View
49 extras/NSString+URLEncoding.m
@@ -0,0 +1,49 @@
+//
+// NSString+URLEncoding.m
+//
+// Created by Jon Crosby on 10/19/07.
+// Copyright 2007 Kaboomerang LLC. All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+
+#import "NSString+URLEncoding.h"
+
+
+@implementation NSString (OAURLEncodingAdditions)
+
+- (NSString *)encodedURLString {
+ NSString *result = (NSString *)CFURLCreateStringByAddingPercentEscapes(kCFAllocatorDefault,
+ (CFStringRef)self,
+ NULL, // characters to leave unescaped (NULL = all escaped sequences are replaced)
+ CFSTR("?=&+"), // legal URL characters to be escaped (NULL = all legal characters are replaced)
+ kCFStringEncodingUTF8); // encoding
+ return result;
+}
+
+- (NSString *)encodedURLParameterString {
+ NSString *result = (NSString *)CFURLCreateStringByAddingPercentEscapes(kCFAllocatorDefault,
+ (CFStringRef)self,
+ NULL,
+ CFSTR(":/=,!$&'()*+;[]@#?"),
+ kCFStringEncodingUTF8);
+ return result;
+}
+
+@end
View
71 objective-curl.xcodeproj/nrj.mode1v3
@@ -264,25 +264,24 @@
<key>PBXSmartGroupTreeModuleOutlineStateExpansionKey</key>
<array>
<string>0867D691FE84028FC02AAC07</string>
- <string>0BBF83D810EFD6B0005358BB</string>
<string>0B76051210DF12CB00BE0666</string>
<string>08FB77AEFE84172EC02AAC07</string>
- <string>0B40BA0411AF477E00158EEB</string>
+ <string>0BEDAAB910EC44E200ED2C69</string>
<string>0BD6240610DF1BF4004D8C5B</string>
<string>018293C211BD5ACE00B4AEA1</string>
<string>0BD3CFB5110CF2F700478C99</string>
<string>0B76052210DF134E00BE0666</string>
<string>0B76051B10DF131A00BE0666</string>
<string>089C1665FE841158C02AAC07</string>
+ <string>0B2E387A10DF2C3300E82CB2</string>
<string>1C37FBAC04509CD000000102</string>
<string>1C37FABC05509CD000000102</string>
</array>
<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
<array>
<array>
- <integer>32</integer>
- <integer>22</integer>
- <integer>11</integer>
+ <integer>4</integer>
+ <integer>2</integer>
<integer>0</integer>
</array>
</array>
@@ -306,7 +305,7 @@
<real>221</real>
</array>
<key>RubberWindowFrame</key>
- <string>27 437 1128 692 0 0 1920 1178 </string>
+ <string>11 443 1128 692 0 0 1920 1178 </string>
</dict>
<key>Module</key>
<string>PBXSmartGroupTreeModule</string>
@@ -324,7 +323,7 @@
<key>PBXProjectModuleGUID</key>
<string>1CE0B20306471E060097A5F4</string>
<key>PBXProjectModuleLabel</key>
- <string>CurlOperation.m</string>
+ <string>TestController.m</string>
<key>PBXSplitModuleInNavigatorKey</key>
<dict>
<key>Split0</key>
@@ -332,11 +331,11 @@
<key>PBXProjectModuleGUID</key>
<string>1CE0B20406471E060097A5F4</string>
<key>PBXProjectModuleLabel</key>
- <string>CurlOperation.m</string>
+ <string>TestController.m</string>
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
- <string>0BE7C2CC11C5A75B00A25212</string>
+ <string>0BA1B6AD11C5DE7B005A88BC</string>
<key>history</key>
<array>
<string>0BD102D411BDE372002BC5CC</string>
@@ -362,16 +361,20 @@
<string>0B9CA8CB11C406E6002E05DF</string>
<string>0B9CA8CE11C406E6002E05DF</string>
<string>0B49C80A11C40F6C00994AE7</string>
- <string>0B17198A11C41B7B00818F3A</string>
<string>0B17198C11C41B7B00818F3A</string>
<string>0B17198D11C41B7B00818F3A</string>
<string>0B171A3F11C41EC300818F3A</string>
<string>0BDB4A9D11C55A0000456AE1</string>
- <string>0BE4714211C582A5000914CA</string>
<string>0BE7C18E11C58EA900A25212</string>
- <string>0BE7C18F11C58EA900A25212</string>
- <string>0BE7C2CA11C5A75B00A25212</string>
- <string>0BE7C2CB11C5A75B00A25212</string>
+ <string>0BA1B63A11C5CAED005A88BC</string>
+ <string>0BA1B65911C5CC81005A88BC</string>
+ <string>0BA1B69211C5DC9A005A88BC</string>
+ <string>0BA1B69311C5DC9A005A88BC</string>
+ <string>0BA1B69811C5DD08005A88BC</string>
+ <string>0BA1B69911C5DD08005A88BC</string>
+ <string>0BA1B6A211C5DD34005A88BC</string>
+ <string>0BA1B6AB11C5DE7B005A88BC</string>
+ <string>0BA1B6AC11C5DE7B005A88BC</string>
</array>
</dict>
<key>SplitCount</key>
@@ -385,7 +388,7 @@
<key>Frame</key>
<string>{{0, 0}, {885, 646}}</string>
<key>RubberWindowFrame</key>
- <string>27 437 1128 692 0 0 1920 1178 </string>
+ <string>11 443 1128 692 0 0 1920 1178 </string>
</dict>
<key>Module</key>
<string>PBXNavigatorGroup</string>
@@ -405,7 +408,7 @@
<key>Frame</key>
<string>{{0, 651}, {885, 0}}</string>
<key>RubberWindowFrame</key>
- <string>27 437 1128 692 0 0 1920 1178 </string>
+ <string>11 443 1128 692 0 0 1920 1178 </string>
</dict>
<key>Module</key>
<string>XCDetailModule</string>
@@ -429,9 +432,9 @@
</array>
<key>TableOfContents</key>
<array>
- <string>0BE7C2CD11C5A75B00A25212</string>
+ <string>0BA1B63D11C5CAED005A88BC</string>
<string>1CE0B1FE06471DED0097A5F4</string>
- <string>0BE7C2CE11C5A75B00A25212</string>
+ <string>0BA1B63E11C5CAED005A88BC</string>
<string>1CE0B20306471E060097A5F4</string>
<string>1CE0B20506471E060097A5F4</string>
</array>
@@ -567,11 +570,15 @@
<integer>5</integer>
<key>WindowOrderList</key>
<array>
+ <string>0BA1B65011C5CC32005A88BC</string>
+ <string>0BA1B65111C5CC32005A88BC</string>
+ <string>1CD10A99069EF8BA00B06720</string>
<string>0BD5F72411BDBC6A003119E3</string>
+ <string>1C78EAAD065D492600B07095</string>
<string>/Users/nrj/Code/Cocoa/objective-curl/objective-curl.xcodeproj</string>
</array>
<key>WindowString</key>
- <string>27 437 1128 692 0 0 1920 1178 </string>
+ <string>11 443 1128 692 0 0 1920 1178 </string>
<key>WindowToolsV3</key>
<array>
<dict>
@@ -648,7 +655,7 @@
<key>TableOfContents</key>
<array>
<string>0BD5F72411BDBC6A003119E3</string>
- <string>0BE7C2CF11C5A75B00A25212</string>
+ <string>0BA1B63F11C5CAED005A88BC</string>
<string>1CD0528F0623707200166675</string>
<string>XCMainBuildResultsModuleGUID</string>
</array>
@@ -742,10 +749,10 @@
<key>Frame</key>
<string>{{316, 0}, {378, 203}}</string>
<key>RubberWindowFrame</key>
- <string>334 991 694 422 0 0 1920 1178 </string>
+ <string>334 756 694 422 0 0 1920 1178 </string>
</dict>
<key>RubberWindowFrame</key>
- <string>334 991 694 422 0 0 1920 1178 </string>
+ <string>334 756 694 422 0 0 1920 1178 </string>
</dict>
<key>Module</key>
<string>PBXDebugSessionModule</string>
@@ -768,18 +775,18 @@
<key>TableOfContents</key>
<array>
<string>1CD10A99069EF8BA00B06720</string>
- <string>0B17199011C41B7B00818F3A</string>
+ <string>0BA1B64511C5CC25005A88BC</string>
<string>1C162984064C10D400B95A72</string>
- <string>0B17199111C41B7B00818F3A</string>
- <string>0B17199211C41B7B00818F3A</string>
- <string>0B17199311C41B7B00818F3A</string>
- <string>0B17199411C41B7B00818F3A</string>
- <string>0B17199511C41B7B00818F3A</string>
+ <string>0BA1B64611C5CC25005A88BC</string>
+ <string>0BA1B64711C5CC25005A88BC</string>
+ <string>0BA1B64811C5CC25005A88BC</string>
+ <string>0BA1B64911C5CC25005A88BC</string>
+ <string>0BA1B64A11C5CC25005A88BC</string>
</array>
<key>ToolbarConfiguration</key>
<string>xcode.toolbar.config.debugV3</string>
<key>WindowString</key>
- <string>334 991 694 422 0 0 1920 1178 </string>
+ <string>334 756 694 422 0 0 1920 1178 </string>
<key>WindowToolGUID</key>
<string>1CD10A99069EF8BA00B06720</string>
<key>WindowToolIsVisible</key>
@@ -907,7 +914,7 @@
<key>Frame</key>
<string>{{0, 0}, {1308, 323}}</string>
<key>RubberWindowFrame</key>
- <string>603 65 1308 364 0 0 1920 1178 </string>
+ <string>522 169 1308 364 0 0 1920 1178 </string>
</dict>
<key>Module</key>
<string>PBXDebugCLIModule</string>
@@ -930,13 +937,13 @@
<key>TableOfContents</key>
<array>
<string>1C78EAAD065D492600B07095</string>
- <string>0B0D2BD111C4172800E2371D</string>
+ <string>0BA1B64E11C5CC32005A88BC</string>
<string>1C78EAAC065D492600B07095</string>
</array>
<key>ToolbarConfiguration</key>
<string>xcode.toolbar.config.consoleV3</string>
<key>WindowString</key>
- <string>603 65 1308 364 0 0 1920 1178 </string>
+ <string>522 169 1308 364 0 0 1920 1178 </string>
<key>WindowToolGUID</key>
<string>1C78EAAD065D492600B07095</string>
<key>WindowToolIsVisible</key>
View
544 objective-curl.xcodeproj/nrj.pbxuser
@@ -3,12 +3,11 @@
0867D690FE84028FC02AAC07 /* Project object */ = {
activeBuildConfigurationName = Release;
activeExecutable = 0BD5F71811BDBC66003119E3 /* CurlTester */;
- activeTarget = 8DC2EF4F0486A6940098B216 /* objective-curl */;
+ activeTarget = 0BD6227210DF1564004D8C5B /* CurlTester */;
addToTargets = (
8DC2EF4F0486A6940098B216 /* objective-curl */,
);
breakpoints = (
- 0B0D2BEC11C4187C00E2371D /* TestController.m:133 */,
);
codeSenseManager = 0BD5F72911BDBC85003119E3 /* Code sense */;
executables = (
@@ -83,49 +82,93 @@
PBXFileDataSource_Warnings_ColumnID,
);
};
- PBXPerProjectTemplateStateSaveDate = 298166011;
- PBXWorkspaceStateSaveDate = 298166011;
+ PBXPerProjectTemplateStateSaveDate = 298175191;
+ PBXWorkspaceStateSaveDate = 298175191;
};
perUserProjectItems = {
- 0B149EFC11BF116C00FB735F /* PBXTextBookmark */ = 0B149EFC11BF116C00FB735F /* PBXTextBookmark */;
- 0B149F0511BF12D300FB735F /* PBXTextBookmark */ = 0B149F0511BF12D300FB735F /* PBXTextBookmark */;
- 0B149F8911BF1E8400FB735F /* PBXTextBookmark */ = 0B149F8911BF1E8400FB735F /* PBXTextBookmark */;
- 0B17198A11C41B7B00818F3A /* PBXTextBookmark */ = 0B17198A11C41B7B00818F3A /* PBXTextBookmark */;
- 0B17198C11C41B7B00818F3A /* PBXTextBookmark */ = 0B17198C11C41B7B00818F3A /* PBXTextBookmark */;
- 0B17198D11C41B7B00818F3A /* PBXTextBookmark */ = 0B17198D11C41B7B00818F3A /* PBXTextBookmark */;
- 0B171A3F11C41EC300818F3A /* PBXTextBookmark */ = 0B171A3F11C41EC300818F3A /* PBXTextBookmark */;
- 0B49C80A11C40F6C00994AE7 /* PBXTextBookmark */ = 0B49C80A11C40F6C00994AE7 /* PBXTextBookmark */;
- 0B9CA66311C29D05002E05DF /* PBXTextBookmark */ = 0B9CA66311C29D05002E05DF /* PBXTextBookmark */;
- 0B9CA6BB11C2AF0A002E05DF /* PBXTextBookmark */ = 0B9CA6BB11C2AF0A002E05DF /* PBXTextBookmark */;
- 0B9CA6D811C2B029002E05DF /* PBXTextBookmark */ = 0B9CA6D811C2B029002E05DF /* PBXTextBookmark */;
- 0B9CA78211C3ED1B002E05DF /* PBXTextBookmark */ = 0B9CA78211C3ED1B002E05DF /* PBXTextBookmark */;
- 0B9CA7E711C3FB7F002E05DF /* PBXTextBookmark */ = 0B9CA7E711C3FB7F002E05DF /* PBXTextBookmark */;
- 0B9CA7E811C3FB7F002E05DF /* PBXTextBookmark */ = 0B9CA7E811C3FB7F002E05DF /* PBXTextBookmark */;
- 0B9CA7EA11C3FB7F002E05DF /* PBXTextBookmark */ = 0B9CA7EA11C3FB7F002E05DF /* PBXTextBookmark */;
- 0B9CA7ED11C3FB7F002E05DF /* PBXTextBookmark */ = 0B9CA7ED11C3FB7F002E05DF /* PBXTextBookmark */;
- 0B9CA80811C3FBFC002E05DF /* PBXTextBookmark */ = 0B9CA80811C3FBFC002E05DF /* PBXTextBookmark */;
- 0B9CA83611C3FEE8002E05DF /* PBXTextBookmark */ = 0B9CA83611C3FEE8002E05DF /* PBXTextBookmark */;
- 0B9CA8CB11C406E6002E05DF /* PBXTextBookmark */ = 0B9CA8CB11C406E6002E05DF /* PBXTextBookmark */;
- 0B9CA8CE11C406E6002E05DF /* PBXTextBookmark */ = 0B9CA8CE11C406E6002E05DF /* PBXTextBookmark */;
- 0BD102D411BDE372002BC5CC /* PBXTextBookmark */ = 0BD102D411BDE372002BC5CC /* PBXTextBookmark */;
- 0BD1030711BDE5F0002BC5CC /* PBXTextBookmark */ = 0BD1030711BDE5F0002BC5CC /* PBXTextBookmark */;
- 0BD1034711BDE8F3002BC5CC /* PBXTextBookmark */ = 0BD1034711BDE8F3002BC5CC /* PBXTextBookmark */;
- 0BDB4A9D11C55A0000456AE1 /* PBXTextBookmark */ = 0BDB4A9D11C55A0000456AE1 /* PBXTextBookmark */;
- 0BDCB0D711C293AE00AD8451 /* PBXTextBookmark */ = 0BDCB0D711C293AE00AD8451 /* PBXTextBookmark */;
- 0BDCB0DA11C293AE00AD8451 /* PBXTextBookmark */ = 0BDCB0DA11C293AE00AD8451 /* PBXTextBookmark */;
- 0BDCB0F011C2961100AD8451 /* PBXTextBookmark */ = 0BDCB0F011C2961100AD8451 /* PBXTextBookmark */;
- 0BE4714211C582A5000914CA /* PBXTextBookmark */ = 0BE4714211C582A5000914CA /* PBXTextBookmark */;
- 0BE7C18E11C58EA900A25212 /* PBXTextBookmark */ = 0BE7C18E11C58EA900A25212 /* PBXTextBookmark */;
- 0BE7C18F11C58EA900A25212 /* PBXTextBookmark */ = 0BE7C18F11C58EA900A25212 /* PBXTextBookmark */;
- 0BE7C2CA11C5A75B00A25212 /* PBXTextBookmark */ = 0BE7C2CA11C5A75B00A25212 /* PBXTextBookmark */;
- 0BE7C2CB11C5A75B00A25212 /* PBXTextBookmark */ = 0BE7C2CB11C5A75B00A25212 /* PBXTextBookmark */;
- 0BE7C2CC11C5A75B00A25212 /* PBXTextBookmark */ = 0BE7C2CC11C5A75B00A25212 /* PBXTextBookmark */;
- 0BEB3EE511C28E4C00719A73 /* PBXTextBookmark */ = 0BEB3EE511C28E4C00719A73 /* PBXTextBookmark */;
+ 0B149EFC11BF116C00FB735F = 0B149EFC11BF116C00FB735F /* PBXTextBookmark */;
+ 0B149F0511BF12D300FB735F = 0B149F0511BF12D300FB735F /* PBXTextBookmark */;
+ 0B149F8911BF1E8400FB735F = 0B149F8911BF1E8400FB735F /* PBXTextBookmark */;
+ 0B17198A11C41B7B00818F3A = 0B17198A11C41B7B00818F3A /* PBXTextBookmark */;
+ 0B17198C11C41B7B00818F3A = 0B17198C11C41B7B00818F3A /* PBXTextBookmark */;
+ 0B17198D11C41B7B00818F3A = 0B17198D11C41B7B00818F3A /* PBXTextBookmark */;
+ 0B171A3F11C41EC300818F3A = 0B171A3F11C41EC300818F3A /* PBXTextBookmark */;
+ 0B49C80A11C40F6C00994AE7 = 0B49C80A11C40F6C00994AE7 /* PBXTextBookmark */;
+ 0B9CA66311C29D05002E05DF = 0B9CA66311C29D05002E05DF /* PBXTextBookmark */;
+ 0B9CA6BB11C2AF0A002E05DF = 0B9CA6BB11C2AF0A002E05DF /* PBXTextBookmark */;
+ 0B9CA6D811C2B029002E05DF = 0B9CA6D811C2B029002E05DF /* PBXTextBookmark */;
+ 0B9CA78211C3ED1B002E05DF = 0B9CA78211C3ED1B002E05DF /* PBXTextBookmark */;
+ 0B9CA7E711C3FB7F002E05DF = 0B9CA7E711C3FB7F002E05DF /* PBXTextBookmark */;
+ 0B9CA7E811C3FB7F002E05DF = 0B9CA7E811C3FB7F002E05DF /* PBXTextBookmark */;
+ 0B9CA7EA11C3FB7F002E05DF = 0B9CA7EA11C3FB7F002E05DF /* PBXTextBookmark */;
+ 0B9CA7ED11C3FB7F002E05DF = 0B9CA7ED11C3FB7F002E05DF /* PBXTextBookmark */;
+ 0B9CA80811C3FBFC002E05DF = 0B9CA80811C3FBFC002E05DF /* PBXTextBookmark */;
+ 0B9CA83611C3FEE8002E05DF = 0B9CA83611C3FEE8002E05DF /* PBXTextBookmark */;
+ 0B9CA8CB11C406E6002E05DF = 0B9CA8CB11C406E6002E05DF /* PBXTextBookmark */;
+ 0B9CA8CE11C406E6002E05DF = 0B9CA8CE11C406E6002E05DF /* PBXTextBookmark */;
+ 0BA1B63A11C5CAED005A88BC /* PBXTextBookmark */ = 0BA1B63A11C5CAED005A88BC /* PBXTextBookmark */;
+ 0BA1B63B11C5CAED005A88BC /* PBXTextBookmark */ = 0BA1B63B11C5CAED005A88BC /* PBXTextBookmark */;
+ 0BA1B63C11C5CAED005A88BC /* PBXTextBookmark */ = 0BA1B63C11C5CAED005A88BC /* PBXTextBookmark */;
+ 0BA1B64D11C5CC32005A88BC /* PBXTextBookmark */ = 0BA1B64D11C5CC32005A88BC /* PBXTextBookmark */;
+ 0BA1B65811C5CC81005A88BC /* PBXTextBookmark */ = 0BA1B65811C5CC81005A88BC /* PBXTextBookmark */;
+ 0BA1B65911C5CC81005A88BC /* PBXTextBookmark */ = 0BA1B65911C5CC81005A88BC /* PBXTextBookmark */;
+ 0BA1B65A11C5CC81005A88BC /* PBXTextBookmark */ = 0BA1B65A11C5CC81005A88BC /* PBXTextBookmark */;
+ 0BA1B65B11C5CC81005A88BC /* PBXTextBookmark */ = 0BA1B65B11C5CC81005A88BC /* PBXTextBookmark */;
+ 0BA1B65C11C5CC81005A88BC /* PBXTextBookmark */ = 0BA1B65C11C5CC81005A88BC /* PBXTextBookmark */;
+ 0BA1B66211C5CD0F005A88BC /* PBXTextBookmark */ = 0BA1B66211C5CD0F005A88BC /* PBXTextBookmark */;
+ 0BA1B66311C5CD0F005A88BC /* PBXTextBookmark */ = 0BA1B66311C5CD0F005A88BC /* PBXTextBookmark */;
+ 0BA1B66411C5CD0F005A88BC /* PBXTextBookmark */ = 0BA1B66411C5CD0F005A88BC /* PBXTextBookmark */;
+ 0BA1B66511C5CD0F005A88BC /* PBXTextBookmark */ = 0BA1B66511C5CD0F005A88BC /* PBXTextBookmark */;
+ 0BA1B66711C5DBC5005A88BC /* PBXTextBookmark */ = 0BA1B66711C5DBC5005A88BC /* PBXTextBookmark */;
+ 0BA1B66811C5DBC5005A88BC /* PBXTextBookmark */ = 0BA1B66811C5DBC5005A88BC /* PBXTextBookmark */;
+ 0BA1B66911C5DBC5005A88BC /* PBXTextBookmark */ = 0BA1B66911C5DBC5005A88BC /* PBXTextBookmark */;
+ 0BA1B66A11C5DBC5005A88BC /* PBXTextBookmark */ = 0BA1B66A11C5DBC5005A88BC /* PBXTextBookmark */;
+ 0BA1B69111C5DC9A005A88BC /* PBXTextBookmark */ = 0BA1B69111C5DC9A005A88BC /* PBXTextBookmark */;
+ 0BA1B69211C5DC9A005A88BC /* PBXTextBookmark */ = 0BA1B69211C5DC9A005A88BC /* PBXTextBookmark */;
+ 0BA1B69311C5DC9A005A88BC /* PBXTextBookmark */ = 0BA1B69311C5DC9A005A88BC /* PBXTextBookmark */;
+ 0BA1B69411C5DC9A005A88BC /* PBXTextBookmark */ = 0BA1B69411C5DC9A005A88BC /* PBXTextBookmark */;
+ 0BA1B69511C5DC9A005A88BC /* PBXTextBookmark */ = 0BA1B69511C5DC9A005A88BC /* PBXTextBookmark */;
+ 0BA1B69811C5DD08005A88BC /* PBXTextBookmark */ = 0BA1B69811C5DD08005A88BC /* PBXTextBookmark */;
+ 0BA1B69911C5DD08005A88BC /* PBXTextBookmark */ = 0BA1B69911C5DD08005A88BC /* PBXTextBookmark */;
+ 0BA1B69A11C5DD08005A88BC /* PBXTextBookmark */ = 0BA1B69A11C5DD08005A88BC /* PBXTextBookmark */;
+ 0BA1B69B11C5DD08005A88BC /* PBXTextBookmark */ = 0BA1B69B11C5DD08005A88BC /* PBXTextBookmark */;
+ 0BA1B69D11C5DD23005A88BC /* PBXTextBookmark */ = 0BA1B69D11C5DD23005A88BC /* PBXTextBookmark */;
+ 0BA1B69E11C5DD23005A88BC /* PBXTextBookmark */ = 0BA1B69E11C5DD23005A88BC /* PBXTextBookmark */;
+ 0BA1B69F11C5DD23005A88BC /* PBXTextBookmark */ = 0BA1B69F11C5DD23005A88BC /* PBXTextBookmark */;
+ 0BA1B6A211C5DD34005A88BC /* PBXTextBookmark */ = 0BA1B6A211C5DD34005A88BC /* PBXTextBookmark */;
+ 0BA1B6A311C5DD34005A88BC /* PBXTextBookmark */ = 0BA1B6A311C5DD34005A88BC /* PBXTextBookmark */;
+ 0BA1B6A411C5DD34005A88BC /* PBXTextBookmark */ = 0BA1B6A411C5DD34005A88BC /* PBXTextBookmark */;
+ 0BA1B6A811C5DDA5005A88BC /* PBXTextBookmark */ = 0BA1B6A811C5DDA5005A88BC /* PBXTextBookmark */;
+ 0BA1B6A911C5DDA5005A88BC /* PBXTextBookmark */ = 0BA1B6A911C5DDA5005A88BC /* PBXTextBookmark */;
+ 0BA1B6AB11C5DE7B005A88BC /* PBXTextBookmark */ = 0BA1B6AB11C5DE7B005A88BC /* PBXTextBookmark */;
+ 0BA1B6AC11C5DE7B005A88BC /* PBXTextBookmark */ = 0BA1B6AC11C5DE7B005A88BC /* PBXTextBookmark */;
+ 0BA1B6AD11C5DE7B005A88BC /* PBXTextBookmark */ = 0BA1B6AD11C5DE7B005A88BC /* PBXTextBookmark */;
+ 0BD102D411BDE372002BC5CC = 0BD102D411BDE372002BC5CC /* PBXTextBookmark */;
+ 0BD1030711BDE5F0002BC5CC = 0BD1030711BDE5F0002BC5CC /* PBXTextBookmark */;
+ 0BD1034711BDE8F3002BC5CC = 0BD1034711BDE8F3002BC5CC /* PBXTextBookmark */;
+ 0BDB4A9D11C55A0000456AE1 = 0BDB4A9D11C55A0000456AE1 /* PBXTextBookmark */;
+ 0BDCB0D711C293AE00AD8451 = 0BDCB0D711C293AE00AD8451 /* PBXTextBookmark */;
+ 0BDCB0DA11C293AE00AD8451 = 0BDCB0DA11C293AE00AD8451 /* PBXTextBookmark */;
+ 0BDCB0F011C2961100AD8451 = 0BDCB0F011C2961100AD8451 /* PBXTextBookmark */;
+ 0BE4714211C582A5000914CA = 0BE4714211C582A5000914CA /* PBXTextBookmark */;
+ 0BE7C18E11C58EA900A25212 = 0BE7C18E11C58EA900A25212 /* PBXTextBookmark */;
+ 0BE7C18F11C58EA900A25212 = 0BE7C18F11C58EA900A25212 /* PBXTextBookmark */;
+ 0BE7C2CA11C5A75B00A25212 = 0BE7C2CA11C5A75B00A25212 /* PBXTextBookmark */;
+ 0BE7C2CB11C5A75B00A25212 = 0BE7C2CB11C5A75B00A25212 /* PBXTextBookmark */;
+ 0BE7C2CC11C5A75B00A25212 = 0BE7C2CC11C5A75B00A25212 /* PBXTextBookmark */;
+ 0BEB3EE511C28E4C00719A73 = 0BEB3EE511C28E4C00719A73 /* PBXTextBookmark */;
};
sourceControlManager = 0BD5F72811BDBC85003119E3 /* Source Control */;
userBuildSettings = {
};
};
+ 0B0B975610F58CED007DBFA8 /* NSString+MD5.h */ = {
+ uiCtxt = {
+ sepNavIntBoundsRect = "{{0, 0}, {824, 614}}";
+ sepNavSelRange = "{403, 0}";
+ sepNavVisRange = "{0, 667}";
+ };
+ };
0B0B975710F58CED007DBFA8 /* NSString+MD5.m */ = {
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {805, 637}}";
@@ -133,22 +176,19 @@
sepNavVisRange = "{0, 970}";
};
};
- 0B0D2BEC11C4187C00E2371D /* TestController.m:133 */ = {
- isa = PBXFileBreakpoint;
- actions = (
- );
- breakpointStyle = 0;
- continueAfterActions = 0;
- countType = 0;
- delayBeforeContinue = 0;
- fileReference = 0B76053510DF13DB00BE0666 /* TestController.m */;
- functionName = "-uploadDidFail:message:";
- hitCount = 0;
- ignoreCount = 0;
- lineNumber = 133;
- modificationTime = 298064508.020583;
- originalNumberOfMultipleMatches = 1;
- state = 0;
+ 0B0B975810F58CED007DBFA8 /* NSString+PathExtras.h */ = {
+ uiCtxt = {
+ sepNavIntBoundsRect = "{{0, 0}, {824, 614}}";
+ sepNavSelRange = "{401, 0}";
+ sepNavVisRange = "{0, 401}";
+ };
+ };
+ 0B0B975910F58CED007DBFA8 /* NSString+PathExtras.m */ = {
+ uiCtxt = {
+ sepNavIntBoundsRect = "{{0, 0}, {824, 676}}";
+ sepNavSelRange = "{339, 0}";
+ sepNavVisRange = "{0, 1089}";
+ };
};
0B149E9311BF0BA200FB735F /* S3ListOperation.h */ = {
isa = PBXFileReference;
@@ -166,9 +206,9 @@
path = "/Users/nrj/Code/Cocoa/objective-curl/operations/S3ListOperation.m";
sourceTree = "<absolute>";
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {824, 2704}}";
+ sepNavIntBoundsRect = "{{0, 0}, {1013, 2769}}";
sepNavSelRange = "{4782, 26}";
- sepNavVisRange = "{3864, 1051}";
+ sepNavVisRange = "{921, 1031}";
};
};
0B149EEE11BF114900FB735F /* S3ListOperation.h */ = {
@@ -332,9 +372,9 @@
};
0B76053510DF13DB00BE0666 /* TestController.m */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {1006, 1924}}";
- sepNavSelRange = "{1378, 0}";
- sepNavVisRange = "{1108, 1212}";
+ sepNavIntBoundsRect = "{{0, 0}, {824, 2080}}";
+ sepNavSelRange = "{650, 0}";
+ sepNavVisRange = "{0, 852}";
};
};
0B80542E11A900AA00CEA13A /* CurlS3.h */ = {
@@ -361,9 +401,9 @@
};
0B80545811A9035600CEA13A /* S3UploadOperation.m */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {824, 2041}}";
- sepNavSelRange = "{1012, 0}";
- sepNavVisRange = "{414, 1184}";
+ sepNavIntBoundsRect = "{{0, 0}, {950, 1924}}";
+ sepNavSelRange = "{4137, 0}";
+ sepNavVisRange = "{946, 1528}";
sepNavWindowFrame = "{{405, 104}, {951, 738}}";
};
};
@@ -502,6 +542,367 @@
sepNavWindowFrame = "{{38, 561}, {944, 591}}";
};
};
+ 0BA1B63A11C5CAED005A88BC /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 0BD3CFF1110CF44A00478C99 /* CurlOperation.m */;
+ name = "CurlOperation.m: 101";
+ rLen = 0;
+ rLoc = 2333;
+ rType = 0;
+ vrLen = 1682;
+ vrLoc = 1414;
+ };
+ 0BA1B63B11C5CAED005A88BC /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 0B149E9411BF0BA200FB735F /* S3ListOperation.m */;
+ name = "S3ListOperation.m: 194";
+ rLen = 26;
+ rLoc = 4782;
+ rType = 0;
+ vrLen = 1051;
+ vrLoc = 3864;
+ };
+ 0BA1B63C11C5CAED005A88BC /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 0B80545811A9035600CEA13A /* S3UploadOperation.m */;
+ name = "S3UploadOperation.m: 50";
+ rLen = 0;
+ rLoc = 1045;
+ rType = 0;
+ vrLen = 1684;
+ vrLoc = 1352;
+ };
+ 0BA1B64D11C5CC32005A88BC /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 0B80545811A9035600CEA13A /* S3UploadOperation.m */;
+ name = "S3UploadOperation.m: 69";
+ rLen = 0;
+ rLoc = 1649;
+ rType = 0;
+ vrLen = 1400;
+ vrLoc = 783;
+ };
+ 0BA1B65811C5CC81005A88BC /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 0B76053510DF13DB00BE0666 /* TestController.m */;
+ name = "TestController.m: 132";
+ rLen = 0;
+ rLoc = 2690;
+ rType = 0;
+ vrLen = 895;
+ vrLoc = 1837;
+ };
+ 0BA1B65911C5CC81005A88BC /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 0B149E9411BF0BA200FB735F /* S3ListOperation.m */;
+ name = "S3ListOperation.m: 194";
+ rLen = 26;
+ rLoc = 4782;
+ rType = 0;
+ vrLen = 1031;
+ vrLoc = 921;
+ };
+ 0BA1B65A11C5CC81005A88BC /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 0B80545811A9035600CEA13A /* S3UploadOperation.m */;
+ name = "S3UploadOperation.m: 69";
+ rLen = 0;
+ rLoc = 1649;
+ rType = 0;
+ vrLen = 1404;
+ vrLoc = 561;
+ };
+ 0BA1B65B11C5CC81005A88BC /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 0BD3D010110CF5E700478C99 /* UploadOperation.m */;
+ name = "UploadOperation.m: 35";
+ rLen = 0;
+ rLoc = 572;
+ rType = 0;
+ vrLen = 1151;
+ vrLoc = 359;
+ };
+ 0BA1B65C11C5CC81005A88BC /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 0BD3D010110CF5E700478C99 /* UploadOperation.m */;
+ name = "UploadOperation.m: 35";
+ rLen = 0;
+ rLoc = 572;
+ rType = 0;
+ vrLen = 1151;
+ vrLoc = 359;
+ };
+ 0BA1B66211C5CD0F005A88BC /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 0BD3D010110CF5E700478C99 /* UploadOperation.m */;
+ name = "UploadOperation.m: 44";
+ rLen = 0;
+ rLoc = 887;
+ rType = 0;
+ vrLen = 1095;
+ vrLoc = 359;
+ };
+ 0BA1B66311C5CD0F005A88BC /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 0B80545811A9035600CEA13A /* S3UploadOperation.m */;
+ name = "S3UploadOperation.m: 78";
+ rLen = 0;
+ rLoc = 2016;
+ rType = 0;
+ vrLen = 1727;
+ vrLoc = 1241;
+ };
+ 0BA1B66411C5CD0F005A88BC /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 0B76053510DF13DB00BE0666 /* TestController.m */;
+ name = "TestController.m: 132";
+ rLen = 0;
+ rLoc = 2690;
+ rType = 0;
+ vrLen = 925;
+ vrLoc = 1808;
+ };
+ 0BA1B66511C5CD0F005A88BC /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 0B76053510DF13DB00BE0666 /* TestController.m */;
+ name = "TestController.m: 37";
+ rLen = 0;
+ rLoc = 650;
+ rType = 0;
+ vrLen = 821;
+ vrLoc = 0;
+ };
+ 0BA1B66711C5DBC5005A88BC /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 0B76053510DF13DB00BE0666 /* TestController.m */;
+ name = "TestController.m: 37";
+ rLen = 0;
+ rLoc = 650;
+ rType = 0;
+ vrLen = 821;
+ vrLoc = 0;
+ };
+ 0BA1B66811C5DBC5005A88BC /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 0BD3D010110CF5E700478C99 /* UploadOperation.m */;
+ name = "UploadOperation.m: 39";
+ rLen = 0;
+ rLoc = 668;
+ rType = 0;
+ vrLen = 1095;
+ vrLoc = 359;
+ };
+ 0BA1B66911C5DBC5005A88BC /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 0B80545811A9035600CEA13A /* S3UploadOperation.m */;
+ rLen = 0;
+ rLoc = 63;
+ rType = 1;
+ };
+ 0BA1B66A11C5DBC5005A88BC /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 0B80545811A9035600CEA13A /* S3UploadOperation.m */;
+ name = "S3UploadOperation.m: 63";
+ rLen = 0;
+ rLoc = 1385;
+ rType = 0;
+ vrLen = 1294;
+ vrLoc = 439;
+ };
+ 0BA1B69111C5DC9A005A88BC /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 0B80545811A9035600CEA13A /* S3UploadOperation.m */;
+ name = "S3UploadOperation.m: 40";
+ rLen = 0;
+ rLoc = 931;
+ rType = 0;
+ vrLen = 1294;
+ vrLoc = 439;
+ };
+ 0BA1B69211C5DC9A005A88BC /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 0BE0A33F11A90E3400FBFB1F /* NSString+S3.h */;
+ name = "NSString+S3.h: 1";
+ rLen = 0;
+ rLoc = 0;
+ rType = 0;
+ vrLen = 211;
+ vrLoc = 0;
+ };
+ 0BA1B69311C5DC9A005A88BC /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 0B0B975610F58CED007DBFA8 /* NSString+MD5.h */;
+ name = "NSString+MD5.h: 18";
+ rLen = 0;
+ rLoc = 403;
+ rType = 0;
+ vrLen = 667;
+ vrLoc = 0;
+ };
+ 0BA1B69411C5DC9A005A88BC /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 0B0B975810F58CED007DBFA8 /* NSString+PathExtras.h */;
+ name = "NSString+PathExtras.h: 1";
+ rLen = 0;
+ rLoc = 0;
+ rType = 0;
+ vrLen = 401;
+ vrLoc = 0;
+ };
+ 0BA1B69511C5DC9A005A88BC /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 0B0B975810F58CED007DBFA8 /* NSString+PathExtras.h */;
+ name = "NSString+PathExtras.h: 18";
+ rLen = 0;
+ rLoc = 401;
+ rType = 0;
+ vrLen = 401;
+ vrLoc = 0;
+ };
+ 0BA1B69811C5DD08005A88BC /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 0B0B975810F58CED007DBFA8 /* NSString+PathExtras.h */;
+ name = "NSString+PathExtras.h: 18";
+ rLen = 0;
+ rLoc = 401;
+ rType = 0;
+ vrLen = 401;
+ vrLoc = 0;
+ };
+ 0BA1B69911C5DD08005A88BC /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 0B0B975910F58CED007DBFA8 /* NSString+PathExtras.m */;
+ name = "NSString+PathExtras.m: 17";
+ rLen = 0;
+ rLoc = 339;
+ rType = 0;
+ vrLen = 1089;
+ vrLoc = 0;
+ };
+ 0BA1B69A11C5DD08005A88BC /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 0B80545811A9035600CEA13A /* S3UploadOperation.m */;
+ name = "S3UploadOperation.m: 40";
+ rLen = 0;
+ rLoc = 931;
+ rType = 0;
+ vrLen = 1295;
+ vrLoc = 438;
+ };
+ 0BA1B69B11C5DD08005A88BC /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 0B80545811A9035600CEA13A /* S3UploadOperation.m */;
+ name = "S3UploadOperation.m: 69";
+ rLen = 0;
+ rLoc = 1645;
+ rType = 0;
+ vrLen = 1830;
+ vrLoc = 1028;
+ };
+ 0BA1B69D11C5DD23005A88BC /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 0B80545811A9035600CEA13A /* S3UploadOperation.m */;
+ name = "S3UploadOperation.m: 69";
+ rLen = 0;
+ rLoc = 1645;
+ rType = 0;
+ vrLen = 1830;
+ vrLoc = 1028;
+ };
+ 0BA1B69E11C5DD23005A88BC /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 0BD3D010110CF5E700478C99 /* UploadOperation.m */;
+ rLen = 0;
+ rLoc = 38;
+ rType = 1;
+ };
+ 0BA1B69F11C5DD23005A88BC /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 0BD3D010110CF5E700478C99 /* UploadOperation.m */;
+ name = "UploadOperation.m: 39";
+ rLen = 0;
+ rLoc = 668;
+ rType = 0;
+ vrLen = 1095;
+ vrLoc = 359;
+ };
+ 0BA1B6A211C5DD34005A88BC /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 0BD3D010110CF5E700478C99 /* UploadOperation.m */;
+ name = "UploadOperation.m: 39";
+ rLen = 0;
+ rLoc = 668;
+ rType = 0;
+ vrLen = 1095;
+ vrLoc = 359;
+ };
+ 0BA1B6A311C5DD34005A88BC /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 0B76053510DF13DB00BE0666 /* TestController.m */;
+ rLen = 0;
+ rLoc = 132;
+ rType = 1;
+ };
+ 0BA1B6A411C5DD34005A88BC /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 0B76053510DF13DB00BE0666 /* TestController.m */;
+ name = "TestController.m: 133";
+ rLen = 0;
+ rLoc = 2691;
+ rType = 0;
+ vrLen = 1042;
+ vrLoc = 2031;
+ };
+ 0BA1B6A811C5DDA5005A88BC /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 0B76053510DF13DB00BE0666 /* TestController.m */;
+ name = "TestController.m: 133";
+ rLen = 0;
+ rLoc = 2691;
+ rType = 0;
+ vrLen = 970;
+ vrLoc = 2107;
+ };
+ 0BA1B6A911C5DDA5005A88BC /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 0B80545811A9035600CEA13A /* S3UploadOperation.m */;
+ name = "S3UploadOperation.m: 141";
+ rLen = 0;
+ rLoc = 4137;
+ rType = 0;
+ vrLen = 1247;
+ vrLoc = 2911;
+ };
+ 0BA1B6AB11C5DE7B005A88BC /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 0B80545811A9035600CEA13A /* S3UploadOperation.m */;
+ name = "S3UploadOperation.m: 141";
+ rLen = 0;
+ rLoc = 4137;
+ rType = 0;
+ vrLen = 1528;
+ vrLoc = 946;
+ };
+ 0BA1B6AC11C5DE7B005A88BC /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 0B76053510DF13DB00BE0666 /* TestController.m */;
+ name = "TestController.m: 133";
+ rLen = 0;
+ rLoc = 2691;
+ rType = 0;
+ vrLen = 1046;
+ vrLoc = 2031;
+ };
+ 0BA1B6AD11C5DE7B005A88BC /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 0B76053510DF13DB00BE0666 /* TestController.m */;
+ name = "TestController.m: 37";
+ rLen = 0;
+ rLoc = 650;
+ rType = 0;
+ vrLen = 852;
+ vrLoc = 0;
+ };
0BBF87B910F191C7005358BB /* UploadDelegate.h */ = {
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {824, 949}}";
@@ -576,8 +977,8 @@
};
0BD3CFF1110CF44A00478C99 /* CurlOperation.m */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {894, 2223}}";
- sepNavSelRange = "{1725, 0}";
+ sepNavIntBoundsRect = "{{0, 0}, {894, 2275}}";
+ sepNavSelRange = "{2333, 0}";
sepNavVisRange = "{1414, 1682}";
};
};
@@ -591,9 +992,9 @@
};
0BD3D010110CF5E700478C99 /* UploadOperation.m */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {824, 7085}}";
- sepNavSelRange = "{572, 0}";
- sepNavVisRange = "{264, 1091}";
+ sepNavIntBoundsRect = "{{0, 0}, {824, 7358}}";
+ sepNavSelRange = "{668, 0}";
+ sepNavVisRange = "{359, 1095}";
sepNavWindowFrame = "{{947, 268}, {944, 591}}";
};
};
@@ -733,6 +1134,13 @@
vrLen = 454;
vrLoc = 0;
};
+ 0BE0A33F11A90E3400FBFB1F /* NSString+S3.h */ = {
+ uiCtxt = {
+ sepNavIntBoundsRect = "{{0, 0}, {824, 614}}";
+ sepNavSelRange = "{0, 0}";
+ sepNavVisRange = "{0, 211}";
+ };
+ };
0BE0A34011A90E3400FBFB1F /* NSString+S3.m */ = {
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {992, 832}}";
@@ -765,7 +1173,7 @@
fRef = 0B80545811A9035600CEA13A /* S3UploadOperation.m */;
name = "S3UploadOperation.m: 50";
rLen = 0;
- rLoc = 1012;
+ rLoc = 1045;
rType = 0;
vrLen = 1184;
vrLoc = 414;
View
16 objective-curl.xcodeproj/project.pbxproj
@@ -41,6 +41,8 @@
0B8054A111A9070600CEA13A /* NSFileManager+MimeType.h in Headers */ = {isa = PBXBuildFile; fileRef = 0B80549F11A9070600CEA13A /* NSFileManager+MimeType.h */; };
0B8054A211A9070600CEA13A /* NSFileManager+MimeType.m in Sources */ = {isa = PBXBuildFile; fileRef = 0B8054A011A9070600CEA13A /* NSFileManager+MimeType.m */; };
0B9CA8DE11C408A8002E05DF /* ConnectionDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 0B9CA8DD11C408A8002E05DF /* ConnectionDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 0BA1B68F11C5DC7F005A88BC /* NSString+URLEncoding.h in Headers */ = {isa = PBXBuildFile; fileRef = 0BA1B68D11C5DC7F005A88BC /* NSString+URLEncoding.h */; };
+ 0BA1B69011C5DC7F005A88BC /* NSString+URLEncoding.m in Sources */ = {isa = PBXBuildFile; fileRef = 0BA1B68E11C5DC7F005A88BC /* NSString+URLEncoding.m */; };
0BA5ECF511BC2744009C5194 /* CurlClientType.h in Headers */ = {isa = PBXBuildFile; fileRef = 0BA5ECF411BC2744009C5194 /* CurlClientType.h */; settings = {ATTRIBUTES = (Public, ); }; };
0BB380A310E84BF4003DD538 /* CurlSFTP.h in Headers */ = {isa = PBXBuildFile; fileRef = 0BB380A110E84BF4003DD538 /* CurlSFTP.h */; settings = {ATTRIBUTES = (Public, ); }; };
0BB380A410E84BF4003DD538 /* CurlSFTP.m in Sources */ = {isa = PBXBuildFile; fileRef = 0BB380A210E84BF4003DD538 /* CurlSFTP.m */; };
@@ -150,6 +152,8 @@
0B8054A011A9070600CEA13A /* NSFileManager+MimeType.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSFileManager+MimeType.m"; sourceTree = "<group>"; };
0B8DC51C10DF26E70042F200 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/MainMenu.xib; sourceTree = "<group>"; };
0B9CA8DD11C408A8002E05DF /* ConnectionDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ConnectionDelegate.h; sourceTree = "<group>"; };
+ 0BA1B68D11C5DC7F005A88BC /* NSString+URLEncoding.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+URLEncoding.h"; sourceTree = "<group>"; };
+ 0BA1B68E11C5DC7F005A88BC /* NSString+URLEncoding.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+URLEncoding.m"; sourceTree = "<group>"; };
0BA5ECF411BC2744009C5194 /* CurlClientType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CurlClientType.h; sourceTree = "<group>"; };
0BB380A110E84BF4003DD538 /* CurlSFTP.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CurlSFTP.h; sourceTree = "<group>"; };
0BB380A210E84BF4003DD538 /* CurlSFTP.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CurlSFTP.m; sourceTree = "<group>"; };
@@ -396,14 +400,16 @@
0BEDAAB910EC44E200ED2C69 /* extras */ = {
isa = PBXGroup;
children = (
- 0B0B975610F58CED007DBFA8 /* NSString+MD5.h */,
- 0B0B975710F58CED007DBFA8 /* NSString+MD5.m */,
+ 0BA1B68D11C5DC7F005A88BC /* NSString+URLEncoding.h */,
+ 0BA1B68E11C5DC7F005A88BC /* NSString+URLEncoding.m */,
0B0B975810F58CED007DBFA8 /* NSString+PathExtras.h */,
0B0B975910F58CED007DBFA8 /* NSString+PathExtras.m */,
- 0B80549F11A9070600CEA13A /* NSFileManager+MimeType.h */,
- 0B8054A011A9070600CEA13A /* NSFileManager+MimeType.m */,
+ 0B0B975610F58CED007DBFA8 /* NSString+MD5.h */,
+ 0B0B975710F58CED007DBFA8 /* NSString+MD5.m */,
0BE0A33F11A90E3400FBFB1F /* NSString+S3.h */,
0BE0A34011A90E3400FBFB1F /* NSString+S3.m */,
+ 0B80549F11A9070600CEA13A /* NSFileManager+MimeType.h */,
+ 0B8054A011A9070600CEA13A /* NSFileManager+MimeType.m */,
);
path = extras;
sourceTree = "<group>";
@@ -474,6 +480,7 @@
0B149EF011BF114900FB735F /* S3ListOperation.h in Headers */,
0BDCB0CD11C292F100AD8451 /* S3DateUtil.h in Headers */,
0B9CA8DE11C408A8002E05DF /* ConnectionDelegate.h in Headers */,
+ 0BA1B68F11C5DC7F005A88BC /* NSString+URLEncoding.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -614,6 +621,7 @@
0B40BA0811AF479E00158EEB /* S3ErrorParser.m in Sources */,
0B149EF111BF114900FB735F /* S3ListOperation.m in Sources */,
0BDCB0CE11C292F100AD8451 /* S3DateUtil.m in Sources */,
+ 0BA1B69011C5DC7F005A88BC /* NSString+URLEncoding.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
View
5 operations/S3UploadOperation.m
@@ -13,6 +13,7 @@
#import "S3DateUtil.h"
#import "NSString+S3.h"
#import "NSString+PathExtras.h"
+#import "NSString+URLEncoding.h"
#import "NSFileManager+MimeType.h"
#import "NSObject+Extensions.h"
@@ -65,7 +66,7 @@ - (void)setFileSpecificOptions:(FileTransfer *)file
NSString *date = [S3DateUtil dateStringForNow];
- NSString *resource = [NSString stringWithFormat:@"/%@", [[file remotePath] stringByRemovingTildePrefix]];
+ NSString *resource = [[NSString stringWithFormat:@"/%@", [[file remotePath] stringByRemovingTildePrefix]] encodedURLString];
// Get the content type of the file we're uploading
NSString *contentType = [NSFileManager mimeTypeForFileAtPath:[file localPath]];
@@ -137,7 +138,7 @@ - (NSString *)urlForTransfer:(FileTransfer *)file
NSString *path = [[NSString stringWithFormat:@"%@:%d", [upload hostname], [upload port]] stringByAppendingPathComponent:filePath];
- NSString *url = [NSString stringWithFormat:@"%@://%@", [upload protocolPrefix], path];
+ NSString *url = [NSString stringWithFormat:@"%@://%@", [upload protocolPrefix], [path encodedURLString]];
return url;
}
Please sign in to comment.
Something went wrong with that request. Please try again.