Title: [125944] trunk/Source/WebKit2
- Revision
- 125944
- Author
- [email protected]
- Date
- 2012-08-17 16:11:58 -0700 (Fri, 17 Aug 2012)
Log Message
Adding back the first statement of WebProcessMain accidentally
removed in r125358.
Reviewed by Sam Weinig.
* WebProcess/mac/WebProcessMainMac.mm: Adding back the stripping
of DYLD_INSERT_LIBRARIES.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (125943 => 125944)
--- trunk/Source/WebKit2/ChangeLog 2012-08-17 23:11:22 UTC (rev 125943)
+++ trunk/Source/WebKit2/ChangeLog 2012-08-17 23:11:58 UTC (rev 125944)
@@ -1,3 +1,13 @@
+2012-08-17 Enrica Casucci <[email protected]>
+
+ Adding back the first statement of WebProcessMain accidentally
+ removed in r125358.
+
+ Reviewed by Sam Weinig.
+
+ * WebProcess/mac/WebProcessMainMac.mm: Adding back the stripping
+ of DYLD_INSERT_LIBRARIES.
+
2012-08-17 Sudarsana Nagineni <[email protected]>
[EFL] REGRESSION(r125923): Breaks EFL build
Modified: trunk/Source/WebKit2/WebProcess/mac/WebProcessMainMac.mm (125943 => 125944)
--- trunk/Source/WebKit2/WebProcess/mac/WebProcessMainMac.mm 2012-08-17 23:11:22 UTC (rev 125943)
+++ trunk/Source/WebKit2/WebProcess/mac/WebProcessMainMac.mm 2012-08-17 23:11:58 UTC (rev 125944)
@@ -110,6 +110,10 @@
int WebProcessMain(const CommandLine& commandLine)
{
+ // Remove the WebProcess shim from the DYLD_INSERT_LIBRARIES environment variable so any processes spawned by
+ // the WebProcess don't try to insert the shim and crash.
+ EnvironmentUtilities::stripValuesEndingWithString("DYLD_INSERT_LIBRARIES", "/WebProcessShim.dylib");
+
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
String serviceName = commandLine["servicename"];
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
