Skip to content
Browse files

Merging latest changes from CocoaAsyncSocket project, and updating pr…

…oject settings (GCDAsyncSocket is now ARC).
  • Loading branch information...
1 parent 77f48a3 commit c50791907082c9a529c38a31ff9886b3aac53387 @robbiehanson committed Mar 26, 2012
View
16 Samples/DynamicServer/DynamicServer.xcodeproj/project.pbxproj
@@ -20,7 +20,7 @@
DC12836814A5432A006112AB /* ContextFilterLogFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = DC12835F14A5432A006112AB /* ContextFilterLogFormatter.m */; };
DC12836914A5432A006112AB /* DispatchQueueLogFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = DC12836114A5432A006112AB /* DispatchQueueLogFormatter.m */; };
DC12836A14A5432A006112AB /* README.txt in Resources */ = {isa = PBXBuildFile; fileRef = DC12836214A5432A006112AB /* README.txt */; };
- DC2E2E021298BE76009F096E /* GCDAsyncSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = DC2E2E011298BE76009F096E /* GCDAsyncSocket.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ DC2E2E021298BE76009F096E /* GCDAsyncSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = DC2E2E011298BE76009F096E /* GCDAsyncSocket.m */; };
DC2E2E7A1298C0F8009F096E /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC2E2E791298C0F8009F096E /* Security.framework */; };
DC2E2ED31298C540009F096E /* Web in Resources */ = {isa = PBXBuildFile; fileRef = DC2E2ED01298C540009F096E /* Web */; };
DC2E2EE21298C60A009F096E /* MyHTTPConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = DC2E2EE11298C60A009F096E /* MyHTTPConnection.m */; };
@@ -431,10 +431,7 @@
C01FCF4B08A954540054247B /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_64_BIT)";
- CLANG_ENABLE_OBJC_ARC = YES;
GCC_PREFIX_HEADER = DynamicServer_Prefix.pch;
- GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
INFOPLIST_FILE = "DynamicServer-Info.plist";
PRODUCT_NAME = DynamicServer;
};
@@ -443,10 +440,7 @@
C01FCF4C08A954540054247B /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_64_BIT)";
- CLANG_ENABLE_OBJC_ARC = YES;
GCC_PREFIX_HEADER = DynamicServer_Prefix.pch;
- GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
INFOPLIST_FILE = "DynamicServer-Info.plist";
PRODUCT_NAME = DynamicServer;
};
@@ -456,13 +450,21 @@
isa = XCBuildConfiguration;
baseConfigurationReference = DC372E3B139D37A500A8407D /* Debug.xcconfig */;
buildSettings = {
+ ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+ CLANG_ENABLE_OBJC_ARC = YES;
+ CLANG_WARN_OBJCPP_ARC_ABI = YES;
+ GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
};
name = Debug;
};
C01FCF5008A954540054247B /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = DC372E3D139D37A500A8407D /* Release.xcconfig */;
buildSettings = {
+ ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+ CLANG_ENABLE_OBJC_ARC = YES;
+ CLANG_WARN_OBJCPP_ARC_ABI = YES;
+ GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
};
name = Release;
};
View
18 Samples/PasswdHTTPServer/PasswdHTTPServer.xcodeproj/project.pbxproj
@@ -19,7 +19,7 @@
DC12838A14A5807F006112AB /* ContextFilterLogFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = DC12838114A5807F006112AB /* ContextFilterLogFormatter.m */; };
DC12838B14A5807F006112AB /* DispatchQueueLogFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = DC12838314A5807F006112AB /* DispatchQueueLogFormatter.m */; };
DC12838C14A5807F006112AB /* README.txt in Resources */ = {isa = PBXBuildFile; fileRef = DC12838414A5807F006112AB /* README.txt */; };
- DC2E300B1298EEB1009F096E /* GCDAsyncSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = DC2E300A1298EEB1009F096E /* GCDAsyncSocket.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ DC2E300B1298EEB1009F096E /* GCDAsyncSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = DC2E300A1298EEB1009F096E /* GCDAsyncSocket.m */; };
DC2E302F1298EF89009F096E /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC2E302E1298EF89009F096E /* Security.framework */; };
DC372F32139DC36800A8407D /* DDData.m in Sources */ = {isa = PBXBuildFile; fileRef = DC372F16139DC36800A8407D /* DDData.m */; };
DC372F33139DC36800A8407D /* DDNumber.m in Sources */ = {isa = PBXBuildFile; fileRef = DC372F18139DC36800A8407D /* DDNumber.m */; };
@@ -421,10 +421,7 @@
C01FCF4B08A954540054247B /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_64_BIT)";
- CLANG_ENABLE_OBJC_ARC = YES;
GCC_PREFIX_HEADER = PasswdHTTPServer_Prefix.pch;
- GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
INFOPLIST_FILE = Info.plist;
PRODUCT_NAME = PasswdHTTPServer;
};
@@ -433,10 +430,7 @@
C01FCF4C08A954540054247B /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_64_BIT)";
- CLANG_ENABLE_OBJC_ARC = YES;
GCC_PREFIX_HEADER = PasswdHTTPServer_Prefix.pch;
- GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
INFOPLIST_FILE = Info.plist;
PRODUCT_NAME = PasswdHTTPServer;
};
@@ -446,13 +440,23 @@
isa = XCBuildConfiguration;
baseConfigurationReference = DC372E57139D47B100A8407D /* Debug.xcconfig */;
buildSettings = {
+ ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+ CLANG_ENABLE_OBJC_ARC = YES;
+ CLANG_WARN_OBJCPP_ARC_ABI = YES;
+ GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+ SDKROOT = macosx;
};
name = Debug;
};
C01FCF5008A954540054247B /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = DC372E59139D47B100A8407D /* Release.xcconfig */;
buildSettings = {
+ ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+ CLANG_ENABLE_OBJC_ARC = YES;
+ CLANG_WARN_OBJCPP_ARC_ABI = YES;
+ GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+ SDKROOT = macosx;
};
name = Release;
};
View
18 Samples/PostHTTPServer/PostHTTPServer.xcodeproj/project.pbxproj
@@ -14,7 +14,7 @@
DC11284B0ED6116D00FA818C /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = DC11284A0ED6116D00FA818C /* AppDelegate.m */; };
DC1128750ED6127E00FA818C /* MyHTTPConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = DC1128740ED6127E00FA818C /* MyHTTPConnection.m */; };
DC1128CA0ED61D2B00FA818C /* Web in CopyFiles */ = {isa = PBXBuildFile; fileRef = DC1128C50ED61C4600FA818C /* Web */; };
- DC2E31841298FCAE009F096E /* GCDAsyncSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = DC2E31831298FCAE009F096E /* GCDAsyncSocket.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ DC2E31841298FCAE009F096E /* GCDAsyncSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = DC2E31831298FCAE009F096E /* GCDAsyncSocket.m */; };
DC2E318E1298FCE5009F096E /* DDASLLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = DC2E31871298FCE5009F096E /* DDASLLogger.m */; };
DC2E318F1298FCE5009F096E /* DDFileLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = DC2E31891298FCE5009F096E /* DDFileLogger.m */; };
DC2E31901298FCE5009F096E /* DDLog.m in Sources */ = {isa = PBXBuildFile; fileRef = DC2E318B1298FCE5009F096E /* DDLog.m */; };
@@ -408,10 +408,7 @@
C01FCF4B08A954540054247B /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_64_BIT)";
- CLANG_ENABLE_OBJC_ARC = YES;
GCC_PREFIX_HEADER = PostHTTPServer_Prefix.pch;
- GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
INFOPLIST_FILE = Info.plist;
PRODUCT_NAME = PostHTTPServer;
};
@@ -420,10 +417,7 @@
C01FCF4C08A954540054247B /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_64_BIT)";
- CLANG_ENABLE_OBJC_ARC = YES;
GCC_PREFIX_HEADER = PostHTTPServer_Prefix.pch;
- GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
INFOPLIST_FILE = Info.plist;
PRODUCT_NAME = PostHTTPServer;
};
@@ -433,13 +427,23 @@
isa = XCBuildConfiguration;
baseConfigurationReference = DC372E65139D4ABA00A8407D /* Debug.xcconfig */;
buildSettings = {
+ ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+ CLANG_ENABLE_OBJC_ARC = YES;
+ CLANG_WARN_OBJCPP_ARC_ABI = YES;
+ GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+ SDKROOT = macosx;
};
name = Debug;
};
C01FCF5008A954540054247B /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = DC372E67139D4ABA00A8407D /* Release.xcconfig */;
buildSettings = {
+ ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+ CLANG_ENABLE_OBJC_ARC = YES;
+ CLANG_WARN_OBJCPP_ARC_ABI = YES;
+ GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+ SDKROOT = macosx;
};
name = Release;
};
View
28 Samples/SecureHTTPServer/SecureHTTPServer.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
- objectVersion = 45;
+ objectVersion = 46;
objects = {
/* Begin PBXBuildFile section */
@@ -19,7 +19,7 @@
DC1283C814A66996006112AB /* ContextFilterLogFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = DC1283BF14A66996006112AB /* ContextFilterLogFormatter.m */; };
DC1283C914A66996006112AB /* DispatchQueueLogFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = DC1283C114A66996006112AB /* DispatchQueueLogFormatter.m */; };
DC1283CA14A66996006112AB /* README.txt in Resources */ = {isa = PBXBuildFile; fileRef = DC1283C214A66996006112AB /* README.txt */; };
- DC2E323E1299A3C1009F096E /* GCDAsyncSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = DC2E323D1299A3C1009F096E /* GCDAsyncSocket.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ DC2E323E1299A3C1009F096E /* GCDAsyncSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = DC2E323D1299A3C1009F096E /* GCDAsyncSocket.m */; };
DC372F9A139DC42C00A8407D /* DDData.m in Sources */ = {isa = PBXBuildFile; fileRef = DC372F7E139DC42C00A8407D /* DDData.m */; };
DC372F9B139DC42C00A8407D /* DDNumber.m in Sources */ = {isa = PBXBuildFile; fileRef = DC372F80139DC42C00A8407D /* DDNumber.m */; };
DC372F9C139DC42C00A8407D /* DDRange.m in Sources */ = {isa = PBXBuildFile; fileRef = DC372F82139DC42C00A8407D /* DDRange.m */; };
@@ -346,8 +346,11 @@
/* Begin PBXProject section */
29B97313FDCFA39411CA2CEA /* Project object */ = {
isa = PBXProject;
+ attributes = {
+ LastUpgradeCheck = 0430;
+ };
buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "SecureHTTPServer" */;
- compatibilityVersion = "Xcode 3.1";
+ compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
hasScannedForEncodings = 1;
knownRegions = (
@@ -436,41 +439,42 @@
C01FCF4B08A954540054247B /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_64_BIT)";
- CLANG_ENABLE_OBJC_ARC = YES;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_PREFIX_HEADER = SecureHTTPServer_Prefix.pch;
- GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
INFOPLIST_FILE = Info.plist;
PRODUCT_NAME = SecureHTTPServer;
- SDKROOT = macosx10.7;
};
name = Debug;
};
C01FCF4C08A954540054247B /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_64_BIT)";
- CLANG_ENABLE_OBJC_ARC = YES;
GCC_PREFIX_HEADER = SecureHTTPServer_Prefix.pch;
- GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
INFOPLIST_FILE = Info.plist;
PRODUCT_NAME = SecureHTTPServer;
- SDKROOT = macosx10.7;
};
name = Release;
};
C01FCF4F08A954540054247B /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = DC372E73139D4D4600A8407D /* Debug.xcconfig */;
buildSettings = {
+ ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+ CLANG_ENABLE_OBJC_ARC = YES;
+ CLANG_WARN_OBJCPP_ARC_ABI = YES;
+ GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+ SDKROOT = macosx;
};
name = Debug;
};
C01FCF5008A954540054247B /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = DC372E75139D4D4600A8407D /* Release.xcconfig */;
buildSettings = {
+ ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+ CLANG_ENABLE_OBJC_ARC = YES;
+ CLANG_WARN_OBJCPP_ARC_ABI = YES;
+ GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+ SDKROOT = macosx;
};
name = Release;
};
View
17 Samples/SecureWebSocketServer/SecureWebSocketServer.xcodeproj/project.pbxproj
@@ -21,7 +21,7 @@
DC372DB8139969B600A8407D /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = DC372DB6139969B600A8407D /* Credits.rtf */; };
DC372DBB139969B600A8407D /* SecureWebSocketServerAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = DC372DBA139969B600A8407D /* SecureWebSocketServerAppDelegate.m */; };
DC372DBE139969B700A8407D /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = DC372DBC139969B700A8407D /* MainMenu.xib */; };
- DC372DDF13996A1B00A8407D /* GCDAsyncSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = DC372DDE13996A1B00A8407D /* GCDAsyncSocket.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ DC372DDF13996A1B00A8407D /* GCDAsyncSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = DC372DDE13996A1B00A8407D /* GCDAsyncSocket.m */; };
DC372E1013996D3400A8407D /* MyHTTPConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = DC372E0D13996D3400A8407D /* MyHTTPConnection.m */; };
DC372E1113996D3400A8407D /* MyWebSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = DC372E0F13996D3400A8407D /* MyWebSocket.m */; };
DC372E14139990C800A8407D /* DDKeychain.m in Sources */ = {isa = PBXBuildFile; fileRef = DC372E13139990C800A8407D /* DDKeychain.m */; };
@@ -430,6 +430,10 @@
isa = XCBuildConfiguration;
baseConfigurationReference = DC372E81139D50DA00A8407D /* Debug.xcconfig */;
buildSettings = {
+ ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+ CLANG_ENABLE_OBJC_ARC = YES;
+ CLANG_WARN_OBJCPP_ARC_ABI = YES;
+ GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
SDKROOT = macosx;
};
name = Debug;
@@ -438,18 +442,18 @@
isa = XCBuildConfiguration;
baseConfigurationReference = DC372E83139D50DA00A8407D /* Release.xcconfig */;
buildSettings = {
+ ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+ CLANG_ENABLE_OBJC_ARC = YES;
+ CLANG_WARN_OBJCPP_ARC_ABI = YES;
+ GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
SDKROOT = macosx;
};
name = Release;
};
DC372DC2139969B700A8407D /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_64_BIT)";
- CLANG_ENABLE_OBJC_ARC = YES;
- GCC_DYNAMIC_NO_PIC = NO;
GCC_PREFIX_HEADER = "SecureWebSocketServer/SecureWebSocketServer-Prefix.pch";
- GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
INFOPLIST_FILE = "SecureWebSocketServer/SecureWebSocketServer-Info.plist";
PRODUCT_NAME = "$(TARGET_NAME)";
WRAPPER_EXTENSION = app;
@@ -459,10 +463,7 @@
DC372DC3139969B700A8407D /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_64_BIT)";
- CLANG_ENABLE_OBJC_ARC = YES;
GCC_PREFIX_HEADER = "SecureWebSocketServer/SecureWebSocketServer-Prefix.pch";
- GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
INFOPLIST_FILE = "SecureWebSocketServer/SecureWebSocketServer-Info.plist";
PRODUCT_NAME = "$(TARGET_NAME)";
WRAPPER_EXTENSION = app;
View
18 Samples/SimpleHTTPServer/SimpleHTTPServer.xcodeproj/project.pbxproj
@@ -25,7 +25,7 @@
DC37300D139DC57A00A8407D /* HTTPRedirectResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = DC372FFF139DC57A00A8407D /* HTTPRedirectResponse.m */; };
DC37300E139DC57A00A8407D /* WebSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = DC373001139DC57A00A8407D /* WebSocket.m */; };
DC41D6D90C178D5700F8D00D /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = DC41D6D70C178D5700F8D00D /* AppDelegate.m */; };
- DC9631E0129E2DBB003AC1CE /* GCDAsyncSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = DC9631DF129E2DBB003AC1CE /* GCDAsyncSocket.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ DC9631E0129E2DBB003AC1CE /* GCDAsyncSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = DC9631DF129E2DBB003AC1CE /* GCDAsyncSocket.m */; };
DC963205129E2E3C003AC1CE /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC963204129E2E3C003AC1CE /* Security.framework */; };
DCCBA45914A53B6A005E11A4 /* DDAbstractDatabaseLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = DCCBA44A14A53B6A005E11A4 /* DDAbstractDatabaseLogger.m */; };
DCCBA45A14A53B6A005E11A4 /* DDASLLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = DCCBA44C14A53B6A005E11A4 /* DDASLLogger.m */; };
@@ -429,9 +429,6 @@
C01FCF4B08A954540054247B /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_64_BIT)";
- CLANG_ENABLE_OBJC_ARC = YES;
- GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
PRODUCT_NAME = SimpleHTTPServer;
WRAPPER_EXTENSION = app;
};
@@ -440,9 +437,6 @@
C01FCF4C08A954540054247B /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_64_BIT)";
- CLANG_ENABLE_OBJC_ARC = YES;
- GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
PRODUCT_NAME = SimpleHTTPServer;
WRAPPER_EXTENSION = app;
};
@@ -452,13 +446,23 @@
isa = XCBuildConfiguration;
baseConfigurationReference = DC372E2B139D31CE00A8407D /* Debug.xcconfig */;
buildSettings = {
+ ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+ CLANG_ENABLE_OBJC_ARC = YES;
+ CLANG_WARN_OBJCPP_ARC_ABI = YES;
+ GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+ SDKROOT = macosx;
};
name = Debug;
};
C01FCF5008A954540054247B /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = DC372E2C139D31CE00A8407D /* Release.xcconfig */;
buildSettings = {
+ ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+ CLANG_ENABLE_OBJC_ARC = YES;
+ CLANG_WARN_OBJCPP_ARC_ABI = YES;
+ GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+ SDKROOT = macosx;
};
name = Release;
};
View
28 Samples/SimpleWebSocketServer/SimpleWebSocketServer.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
- objectVersion = 45;
+ objectVersion = 46;
objects = {
/* Begin PBXBuildFile section */
@@ -20,7 +20,7 @@
DC12840C14A66F72006112AB /* ContextFilterLogFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = DC12840314A66F72006112AB /* ContextFilterLogFormatter.m */; };
DC12840D14A66F72006112AB /* DispatchQueueLogFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = DC12840514A66F72006112AB /* DispatchQueueLogFormatter.m */; };
DC12840E14A66F72006112AB /* README.txt in Resources */ = {isa = PBXBuildFile; fileRef = DC12840614A66F72006112AB /* README.txt */; };
- DC2E3573129B962B009F096E /* GCDAsyncSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = DC2E3572129B962B009F096E /* GCDAsyncSocket.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ DC2E3573129B962B009F096E /* GCDAsyncSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = DC2E3572129B962B009F096E /* GCDAsyncSocket.m */; };
DC2E35D3129B97BC009F096E /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC2E35D2129B97BC009F096E /* Security.framework */; };
DC373036139DC5D200A8407D /* DDData.m in Sources */ = {isa = PBXBuildFile; fileRef = DC37301A139DC5D200A8407D /* DDData.m */; };
DC373037139DC5D200A8407D /* DDNumber.m in Sources */ = {isa = PBXBuildFile; fileRef = DC37301C139DC5D200A8407D /* DDNumber.m */; };
@@ -337,8 +337,11 @@
/* Begin PBXProject section */
29B97313FDCFA39411CA2CEA /* Project object */ = {
isa = PBXProject;
+ attributes = {
+ LastUpgradeCheck = 0430;
+ };
buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "SimpleWebSocketServer" */;
- compatibilityVersion = "Xcode 3.1";
+ compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
hasScannedForEncodings = 1;
knownRegions = (
@@ -428,42 +431,43 @@
C01FCF4B08A954540054247B /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_64_BIT)";
- CLANG_ENABLE_OBJC_ARC = YES;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREFIX_HEADER = SimpleWebSocketServer_Prefix.pch;
- GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
INFOPLIST_FILE = "SimpleWebSocketServer-Info.plist";
PRODUCT_NAME = SimpleWebSocketServer;
- SDKROOT = macosx10.7;
};
name = Debug;
};
C01FCF4C08A954540054247B /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_64_BIT)";
- CLANG_ENABLE_OBJC_ARC = YES;
GCC_PREFIX_HEADER = SimpleWebSocketServer_Prefix.pch;
- GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
INFOPLIST_FILE = "SimpleWebSocketServer-Info.plist";
PRODUCT_NAME = SimpleWebSocketServer;
- SDKROOT = macosx10.7;
};
name = Release;
};
C01FCF4F08A954540054247B /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = DC372E97139D52F600A8407D /* Debug.xcconfig */;
buildSettings = {
+ ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+ CLANG_ENABLE_OBJC_ARC = YES;
+ CLANG_WARN_OBJCPP_ARC_ABI = YES;
+ GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+ SDKROOT = macosx;
};
name = Debug;
};
C01FCF5008A954540054247B /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = DC372E99139D52F600A8407D /* Release.xcconfig */;
buildSettings = {
+ ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+ CLANG_ENABLE_OBJC_ARC = YES;
+ CLANG_WARN_OBJCPP_ARC_ABI = YES;
+ GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+ SDKROOT = macosx;
};
name = Release;
};
View
16 Samples/WebDAVServer/WebDAVServer.xcodeproj/project.pbxproj
@@ -32,7 +32,7 @@
DC37324E139F3E8500A8407D /* DELETEResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = DC373249139F3E8500A8407D /* DELETEResponse.m */; };
DC37324F139F3E8500A8407D /* PUTResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = DC37324B139F3E8500A8407D /* PUTResponse.m */; };
DC41D6D90C178D5700F8D00D /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = DC41D6D70C178D5700F8D00D /* AppDelegate.m */; };
- DC9631E0129E2DBB003AC1CE /* GCDAsyncSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = DC9631DF129E2DBB003AC1CE /* GCDAsyncSocket.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ DC9631E0129E2DBB003AC1CE /* GCDAsyncSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = DC9631DF129E2DBB003AC1CE /* GCDAsyncSocket.m */; };
DC9631FD129E2E02003AC1CE /* HTTPDataResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = DC9631F7129E2E02003AC1CE /* HTTPDataResponse.m */; };
DC9631FE129E2E02003AC1CE /* HTTPFileResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = DC9631F9129E2E02003AC1CE /* HTTPFileResponse.m */; };
DC9631FF129E2E02003AC1CE /* HTTPRedirectResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = DC9631FC129E2E02003AC1CE /* HTTPRedirectResponse.m */; };
@@ -429,11 +429,8 @@
C01FCF4B08A954540054247B /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_64_BIT)";
- CLANG_ENABLE_OBJC_ARC = YES;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = WebDAVServer_Prefix.pch;
- GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
HEADER_SEARCH_PATHS = "${SDKROOT}/usr/include/libxml2";
INFOPLIST_FILE = Info.plist;
PRODUCT_NAME = WebDAVServer;
@@ -443,11 +440,8 @@
C01FCF4C08A954540054247B /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_64_BIT)";
- CLANG_ENABLE_OBJC_ARC = YES;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = WebDAVServer_Prefix.pch;
- GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
HEADER_SEARCH_PATHS = "${SDKROOT}/usr/include/libxml2";
INFOPLIST_FILE = Info.plist;
PRODUCT_NAME = WebDAVServer;
@@ -458,6 +452,10 @@
isa = XCBuildConfiguration;
baseConfigurationReference = E23C163F139F16CA009BFD22 /* Debug.xcconfig */;
buildSettings = {
+ ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+ CLANG_ENABLE_OBJC_ARC = YES;
+ CLANG_WARN_OBJCPP_ARC_ABI = YES;
+ GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
SDKROOT = macosx;
};
name = Debug;
@@ -466,6 +464,10 @@
isa = XCBuildConfiguration;
baseConfigurationReference = E23C1641139F16CA009BFD22 /* Release.xcconfig */;
buildSettings = {
+ ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+ CLANG_ENABLE_OBJC_ARC = YES;
+ CLANG_WARN_OBJCPP_ARC_ABI = YES;
+ GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
SDKROOT = macosx;
};
name = Release;
View
4 Samples/Xcode-Configurations/Base.xcconfig
@@ -1,13 +1,9 @@
// Common Settings
-ARCHS = $(ARCHS_STANDARD_32_64_BIT)
-SDKROOT = macosx
-INFOPLIST_FILE = Info.plist
ALWAYS_SEARCH_USER_PATHS = NO
GCC_PRECOMPILE_PREFIX_HEADER = YES
GCC_C_LANGUAGE_STANDARD = c99
GCC_ENABLE_CPP_EXCEPTIONS = NO
GCC_ENABLE_CPP_RTTI = NO
-GCC_DYNAMIC_NO_PIC = YES
// Common Warnings
GCC_WARN_SHADOW = YES
View
23 Samples/iPhoneHTTPServer/iPhoneHTTPServer.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
- objectVersion = 45;
+ objectVersion = 46;
objects = {
/* Begin PBXBuildFile section */
@@ -32,7 +32,7 @@
DC5406D6129F5C9600195140 /* DDFileLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = DC5406D0129F5C9600195140 /* DDFileLogger.m */; };
DC5406D7129F5C9600195140 /* DDLog.m in Sources */ = {isa = PBXBuildFile; fileRef = DC5406D2129F5C9600195140 /* DDLog.m */; };
DC5406D8129F5C9600195140 /* DDTTYLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = DC5406D4129F5C9600195140 /* DDTTYLogger.m */; };
- DC5406E0129F5CB700195140 /* GCDAsyncSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = DC5406DF129F5CB700195140 /* GCDAsyncSocket.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ DC5406E0129F5CB700195140 /* GCDAsyncSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = DC5406DF129F5CB700195140 /* GCDAsyncSocket.m */; };
DC5406E2129F5CC900195140 /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC5406E1129F5CC800195140 /* CFNetwork.framework */; };
DC540781129F638200195140 /* Web in Resources */ = {isa = PBXBuildFile; fileRef = DC54077E129F638200195140 /* Web */; };
/* End PBXBuildFile section */
@@ -290,8 +290,11 @@
/* Begin PBXProject section */
29B97313FDCFA39411CA2CEA /* Project object */ = {
isa = PBXProject;
+ attributes = {
+ LastUpgradeCheck = 0430;
+ };
buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "iPhoneHTTPServer" */;
- compatibilityVersion = "Xcode 3.1";
+ compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
hasScannedForEncodings = 1;
knownRegions = (
@@ -357,21 +360,19 @@
1D6058940D05DD3E006BFB54 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- CLANG_ENABLE_OBJC_ARC = YES;
GCC_PREFIX_HEADER = iPhoneHTTPServer_Prefix.pch;
- GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
INFOPLIST_FILE = "iPhoneHTTPServer-Info.plist";
+ IPHONEOS_DEPLOYMENT_TARGET = 5.0;
PRODUCT_NAME = iPhoneHTTPServer;
};
name = Debug;
};
1D6058950D05DD3E006BFB54 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- CLANG_ENABLE_OBJC_ARC = YES;
GCC_PREFIX_HEADER = iPhoneHTTPServer_Prefix.pch;
- GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
INFOPLIST_FILE = "iPhoneHTTPServer-Info.plist";
+ IPHONEOS_DEPLOYMENT_TARGET = 5.0;
PRODUCT_NAME = iPhoneHTTPServer;
};
name = Release;
@@ -380,6 +381,10 @@
isa = XCBuildConfiguration;
baseConfigurationReference = DC372E49139D398400A8407D /* Debug.xcconfig */;
buildSettings = {
+ ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+ CLANG_ENABLE_OBJC_ARC = YES;
+ CLANG_WARN_OBJCPP_ARC_ABI = YES;
+ GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
SDKROOT = iphoneos;
};
name = Debug;
@@ -388,6 +393,10 @@
isa = XCBuildConfiguration;
baseConfigurationReference = DC372E4B139D398400A8407D /* Release.xcconfig */;
buildSettings = {
+ ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+ CLANG_ENABLE_OBJC_ARC = YES;
+ CLANG_WARN_OBJCPP_ARC_ABI = YES;
+ GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
SDKROOT = iphoneos;
};
name = Release;
View
2 Vendor/CocoaAsyncSocket/GCDAsyncSocket.h
@@ -46,7 +46,7 @@ typedef enum GCDAsyncSocketError GCDAsyncSocketError;
uint32_t flags;
uint16_t config;
- id delegate;
+ __weak id delegate;
dispatch_queue_t delegateQueue;
int socket4FD;
View
623 Vendor/CocoaAsyncSocket/GCDAsyncSocket.m
233 additions, 390 deletions not shown because the diff is too large. Please use a local Git client to view these changes.

0 comments on commit c507919

Please sign in to comment.
Something went wrong with that request. Please try again.