Title: [160661] trunk/Source/WebKit2
- Revision
- 160661
- Author
- benja...@webkit.org
- Date
- 2013-12-16 14:07:18 -0800 (Mon, 16 Dec 2013)
Log Message
[WK2] The NetworkProcess tries to load SecItemShim.dylib on iOS
https://bugs.webkit.org/show_bug.cgi?id=125800
Patch by Benjamin Poulain <bpoul...@apple.com> on 2013-12-16
Reviewed by Dan Bernstein.
Give the NetworkService its own Info.plist configured without the Shim.
* Configurations/NetworkService.xcconfig:
* NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX.plist: Copied from Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info.plist.
* NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-iOS.plist: Renamed from Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info.plist.
* WebKit2.xcodeproj/project.pbxproj:
Modified Paths
Added Paths
Removed Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (160660 => 160661)
--- trunk/Source/WebKit2/ChangeLog 2013-12-16 21:31:42 UTC (rev 160660)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-16 22:07:18 UTC (rev 160661)
@@ -1,3 +1,17 @@
+2013-12-16 Benjamin Poulain <bpoul...@apple.com>
+
+ [WK2] The NetworkProcess tries to load SecItemShim.dylib on iOS
+ https://bugs.webkit.org/show_bug.cgi?id=125800
+
+ Reviewed by Dan Bernstein.
+
+ Give the NetworkService its own Info.plist configured without the Shim.
+
+ * Configurations/NetworkService.xcconfig:
+ * NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX.plist: Copied from Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info.plist.
+ * NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-iOS.plist: Renamed from Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info.plist.
+ * WebKit2.xcodeproj/project.pbxproj:
+
2013-12-16 Brady Eidson <beid...@apple.com>
DatabaseProcess: Fix a few bugs with opening an IDB connection
Modified: trunk/Source/WebKit2/Configurations/NetworkService.xcconfig (160660 => 160661)
--- trunk/Source/WebKit2/Configurations/NetworkService.xcconfig 2013-12-16 21:31:42 UTC (rev 160660)
+++ trunk/Source/WebKit2/Configurations/NetworkService.xcconfig 2013-12-16 22:07:18 UTC (rev 160661)
@@ -24,4 +24,6 @@
#include "BaseXPCService.xcconfig"
PRODUCT_NAME = com.apple.WebKit.Networking;
-INFOPLIST_FILE = NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info.plist;
+INFOPLIST_FILE = $(INFOPLIST_FILE_$(PLATFORM_NAME));
+INFOPLIST_FILE_macosx = NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX.plist;
+INFOPLIST_FILE_iphoneos = NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-iOS.plist;
Added: trunk/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX.plist (0 => 160661)
--- trunk/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX.plist (rev 0)
+++ trunk/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX.plist 2013-12-16 22:07:18 UTC (rev 160661)
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>CFBundleGetInfoString</key>
+ <string>${BUNDLE_VERSION}, Copyright 2003-2013 Apple Inc.</string>
+ <key>CFBundleDevelopmentRegion</key>
+ <string>English</string>
+ <key>CFBundleExecutable</key>
+ <string>${EXECUTABLE_NAME}</string>
+ <key>CFBundleIdentifier</key>
+ <string>com.apple.WebKit.Networking</string>
+ <key>CFBundleInfoDictionaryVersion</key>
+ <string>6.0</string>
+ <key>CFBundleName</key>
+ <string>${PRODUCT_NAME}</string>
+ <key>CFBundlePackageType</key>
+ <string>XPC!</string>
+ <key>CFBundleShortVersionString</key>
+ <string>${SHORT_VERSION_STRING}</string>
+ <key>CFBundleSignature</key>
+ <string>????</string>
+ <key>CFBundleVersion</key>
+ <string>${BUNDLE_VERSION}</string>
+ <key>LSFileQuarantineEnabled</key>
+ <true/>
+ <key>NSPrincipalClass</key>
+ <string>NSApplication</string>
+ <key>WebKitEntryPoint</key>
+ <string>NetworkServiceInitializer</string>
+ <key>LSUIElement</key>
+ <true/>
+ <key>XPCService</key>
+ <dict>
+ <key>ServiceType</key>
+ <string>Application</string>
+ <key>JoinExistingSession</key>
+ <true/>
+ <key>RunLoopType</key>
+ <string>NSRunLoop</string>
+ <key>_MultipleInstances</key>
+ <true/>
+ <key>EnvironmentVariables</key>
+ <dict>
+ <key>DYLD_INSERT_LIBRARIES</key>
+ <string>$(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework/NetworkProcess.app/Contents/MacOS/SecItemShim.dylib</string>
+ </dict>
+ </dict>
+</dict>
+</plist>
Added: trunk/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-iOS.plist (0 => 160661)
--- trunk/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-iOS.plist (rev 0)
+++ trunk/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-iOS.plist 2013-12-16 22:07:18 UTC (rev 160661)
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>CFBundleGetInfoString</key>
+ <string>${BUNDLE_VERSION}, Copyright 2003-2013 Apple Inc.</string>
+ <key>CFBundleDevelopmentRegion</key>
+ <string>English</string>
+ <key>CFBundleExecutable</key>
+ <string>${EXECUTABLE_NAME}</string>
+ <key>CFBundleIdentifier</key>
+ <string>com.apple.WebKit.Networking</string>
+ <key>CFBundleInfoDictionaryVersion</key>
+ <string>6.0</string>
+ <key>CFBundleName</key>
+ <string>${PRODUCT_NAME}</string>
+ <key>CFBundlePackageType</key>
+ <string>XPC!</string>
+ <key>CFBundleShortVersionString</key>
+ <string>${SHORT_VERSION_STRING}</string>
+ <key>CFBundleSignature</key>
+ <string>????</string>
+ <key>CFBundleVersion</key>
+ <string>${BUNDLE_VERSION}</string>
+ <key>LSFileQuarantineEnabled</key>
+ <true/>
+ <key>NSPrincipalClass</key>
+ <string>NSApplication</string>
+ <key>WebKitEntryPoint</key>
+ <string>NetworkServiceInitializer</string>
+ <key>LSUIElement</key>
+ <true/>
+ <key>XPCService</key>
+ <dict>
+ <key>ServiceType</key>
+ <string>Application</string>
+ <key>JoinExistingSession</key>
+ <true/>
+ <key>RunLoopType</key>
+ <string>NSRunLoop</string>
+ <key>_MultipleInstances</key>
+ <true/>
+ </dict>
+</dict>
+</plist>
Deleted: trunk/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info.plist (160660 => 160661)
--- trunk/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info.plist 2013-12-16 21:31:42 UTC (rev 160660)
+++ trunk/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info.plist 2013-12-16 22:07:18 UTC (rev 160661)
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>CFBundleGetInfoString</key>
- <string>${BUNDLE_VERSION}, Copyright 2003-2013 Apple Inc.</string>
- <key>CFBundleDevelopmentRegion</key>
- <string>English</string>
- <key>CFBundleExecutable</key>
- <string>${EXECUTABLE_NAME}</string>
- <key>CFBundleIdentifier</key>
- <string>com.apple.WebKit.Networking</string>
- <key>CFBundleInfoDictionaryVersion</key>
- <string>6.0</string>
- <key>CFBundleName</key>
- <string>${PRODUCT_NAME}</string>
- <key>CFBundlePackageType</key>
- <string>XPC!</string>
- <key>CFBundleShortVersionString</key>
- <string>${SHORT_VERSION_STRING}</string>
- <key>CFBundleSignature</key>
- <string>????</string>
- <key>CFBundleVersion</key>
- <string>${BUNDLE_VERSION}</string>
- <key>LSFileQuarantineEnabled</key>
- <true/>
- <key>NSPrincipalClass</key>
- <string>NSApplication</string>
- <key>WebKitEntryPoint</key>
- <string>NetworkServiceInitializer</string>
- <key>LSUIElement</key>
- <true/>
- <key>XPCService</key>
- <dict>
- <key>ServiceType</key>
- <string>Application</string>
- <key>JoinExistingSession</key>
- <true/>
- <key>RunLoopType</key>
- <string>NSRunLoop</string>
- <key>_MultipleInstances</key>
- <true/>
- <key>EnvironmentVariables</key>
- <dict>
- <key>DYLD_INSERT_LIBRARIES</key>
- <string>$(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework/NetworkProcess.app/Contents/MacOS/SecItemShim.dylib</string>
- </dict>
- </dict>
-</dict>
-</plist>
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (160660 => 160661)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2013-12-16 21:31:42 UTC (rev 160660)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2013-12-16 22:07:18 UTC (rev 160661)
@@ -1906,6 +1906,7 @@
1F0181731858DC1600F92884 /* WKWebProcessPlugInScriptWorld.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKWebProcessPlugInScriptWorld.mm; sourceTree = "<group>"; };
1F0181741858DC1600F92884 /* WKWebProcessPlugInScriptWorldInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebProcessPlugInScriptWorldInternal.h; sourceTree = "<group>"; };
1F335BBF185B84D8001A201A /* WKWebProcessPlugInLoadDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebProcessPlugInLoadDelegate.h; sourceTree = "<group>"; };
+ 26659AA0185FAAED004303DD /* Info-iOS.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-iOS.plist"; sourceTree = "<group>"; };
290F4271172A0C7400939FF0 /* ChildProcessSupplement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChildProcessSupplement.h; sourceTree = "<group>"; };
293EBEA91627D9C9005F89F1 /* WKDOMText.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKDOMText.h; sourceTree = "<group>"; };
293EBEAA1627D9C9005F89F1 /* WKDOMText.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKDOMText.mm; sourceTree = "<group>"; };
@@ -2656,7 +2657,7 @@
BC82839616B47EC400A278FE /* XPCServiceMain.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = XPCServiceMain.mm; sourceTree = "<group>"; };
BC82839716B480F600A278FE /* XPCServiceMain.Development.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = XPCServiceMain.Development.mm; sourceTree = "<group>"; };
BC82839816B48DC000A278FE /* WebContentServiceEntryPoint.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebContentServiceEntryPoint.mm; sourceTree = "<group>"; };
- BC8283A316B4BD9100A278FE /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+ BC8283A316B4BD9100A278FE /* Info-OSX.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-OSX.plist"; sourceTree = "<group>"; };
BC8283A616B4BD9100A278FE /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
BC8283A816B4BD9100A278FE /* NetworkServiceEntryPoint.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = NetworkServiceEntryPoint.mm; sourceTree = "<group>"; };
BC8283AA16B4BEAD00A278FE /* NetworkService.Development.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = NetworkService.Development.xcconfig; sourceTree = "<group>"; };
@@ -5156,7 +5157,8 @@
BC8283A216B4BD9100A278FE /* NetworkService */ = {
isa = PBXGroup;
children = (
- BC8283A316B4BD9100A278FE /* Info.plist */,
+ 26659AA0185FAAED004303DD /* Info-iOS.plist */,
+ BC8283A316B4BD9100A278FE /* Info-OSX.plist */,
);
path = NetworkService;
sourceTree = "<group>";
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
