Title: [97728] trunk/Source/WebKit2
- Revision
- 97728
- Author
- [email protected]
- Date
- 2011-10-18 01:48:17 -0700 (Tue, 18 Oct 2011)
Log Message
[UNIX] Use SOCK_SEQPACKET when available
https://bugs.webkit.org/show_bug.cgi?id=61287
Reviewed by Darin Adler.
Sockets of type SEQPACKET are actually DGRAM sockets but that
notifies the other end when the connection is closed. When
SEQPACKET sockets are not available GTK+ port uses STREAM sockets
while Qt port uses DGRAM sockets.
* PluginProcess/PluginProcess.cpp: Use SOCK_SEQPACKET if possible.
* UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp:
(WebKit::ProcessLauncher::launchProcess): Ditto.
* UIProcess/Launcher/qt/ProcessLauncherQt.cpp:
(WebKit::ProcessLauncher::launchProcess): Ditto.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (97727 => 97728)
--- trunk/Source/WebKit2/ChangeLog 2011-10-18 08:39:18 UTC (rev 97727)
+++ trunk/Source/WebKit2/ChangeLog 2011-10-18 08:48:17 UTC (rev 97728)
@@ -1,3 +1,21 @@
+2011-10-18 Carlos Garcia Campos <[email protected]>
+
+ [UNIX] Use SOCK_SEQPACKET when available
+ https://bugs.webkit.org/show_bug.cgi?id=61287
+
+ Reviewed by Darin Adler.
+
+ Sockets of type SEQPACKET are actually DGRAM sockets but that
+ notifies the other end when the connection is closed. When
+ SEQPACKET sockets are not available GTK+ port uses STREAM sockets
+ while Qt port uses DGRAM sockets.
+
+ * PluginProcess/PluginProcess.cpp: Use SOCK_SEQPACKET if possible.
+ * UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp:
+ (WebKit::ProcessLauncher::launchProcess): Ditto.
+ * UIProcess/Launcher/qt/ProcessLauncherQt.cpp:
+ (WebKit::ProcessLauncher::launchProcess): Ditto.
+
2011-10-17 Jon Lee <[email protected]>
Filtering of URLs when serializing back forward list saves bad current index value
Modified: trunk/Source/WebKit2/PluginProcess/PluginProcess.cpp (97727 => 97728)
--- trunk/Source/WebKit2/PluginProcess/PluginProcess.cpp 2011-10-18 08:39:18 UTC (rev 97727)
+++ trunk/Source/WebKit2/PluginProcess/PluginProcess.cpp 2011-10-18 08:48:17 UTC (rev 97728)
@@ -44,12 +44,16 @@
#include <sys/socket.h>
#include <unistd.h>
+#ifdef SOCK_SEQPACKET
+#define SOCKET_TYPE SOCK_SEQPACKET
+#else
#if PLATFORM(GTK)
#define SOCKET_TYPE SOCK_STREAM
#else
#define SOCKET_TYPE SOCK_DGRAM
#endif
-#endif
+#endif // SOCK_SEQPACKET
+#endif // USE(UNIX_DOMAIN_SOCKETS)
namespace WebKit {
Modified: trunk/Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp (97727 => 97728)
--- trunk/Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp 2011-10-18 08:39:18 UTC (rev 97727)
+++ trunk/Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp 2011-10-18 08:48:17 UTC (rev 97728)
@@ -39,6 +39,12 @@
#include <wtf/text/WTFString.h>
#include <wtf/gobject/GOwnPtr.h>
+#ifdef SOCK_SEQPACKET
+#define SOCKET_TYPE SOCK_SEQPACKET
+#else
+#define SOCKET_TYPE SOCK_STREAM
+#endif
+
using namespace WebCore;
namespace WebKit {
@@ -70,7 +76,7 @@
GPid pid = 0;
int sockets[2];
- if (socketpair(AF_UNIX, SOCK_STREAM, 0, sockets) < 0) {
+ if (socketpair(AF_UNIX, SOCKET_TYPE, 0, sockets) < 0) {
g_printerr("Creation of socket failed: %s.\n", g_strerror(errno));
ASSERT_NOT_REACHED();
return;
Modified: trunk/Source/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp (97727 => 97728)
--- trunk/Source/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp 2011-10-18 08:39:18 UTC (rev 97727)
+++ trunk/Source/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp 2011-10-18 08:48:17 UTC (rev 97728)
@@ -55,6 +55,12 @@
#include <signal.h>
#endif
+#ifdef SOCK_SEQPACKET
+#define SOCKET_TYPE SOCK_SEQPACKET
+#else
+#define SOCKET_TYPE SOCK_DGRAM
+#endif
+
using namespace WebCore;
namespace WebKit {
@@ -97,7 +103,7 @@
}
int sockets[2];
- if (socketpair(AF_UNIX, SOCK_DGRAM, 0, sockets) == -1) {
+ if (socketpair(AF_UNIX, SOCKET_TYPE, 0, sockets) == -1) {
qDebug() << "Creation of socket failed with errno:" << errno;
ASSERT_NOT_REACHED();
return;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
