summaryrefslogtreecommitdiffstats
path: root/unix/tclUnixSock.c
diff options
context:
space:
mode:
authormax <max@tclers.tk>2011-08-29 23:24:36 (GMT)
committermax <max@tclers.tk>2011-08-29 23:24:36 (GMT)
commit3622c1c59979ebf0f7a5a0486879690db29211dc (patch)
tree5f3032d1d13521ec3e1ea518ae2dee08a106b428 /unix/tclUnixSock.c
parent63fa9aad1d0ff98fecbacf57d0677308d5adab8f (diff)
downloadtcl-3622c1c59979ebf0f7a5a0486879690db29211dc.zip
tcl-3622c1c59979ebf0f7a5a0486879690db29211dc.tar.gz
tcl-3622c1c59979ebf0f7a5a0486879690db29211dc.tar.bz2
Put back the check for server sockets (bug #3394732).
Diffstat (limited to 'unix/tclUnixSock.c')
-rw-r--r--unix/tclUnixSock.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/unix/tclUnixSock.c b/unix/tclUnixSock.c
index f302b70..35c00c5 100644
--- a/unix/tclUnixSock.c
+++ b/unix/tclUnixSock.c
@@ -816,6 +816,15 @@ TcpWatchProc(
* TCL_EXCEPTION. */
{
TcpState *statePtr = (TcpState *) instanceData;
+
+ if (statePtr->acceptProc != NULL) {
+ /*
+ * Make sure we don't mess with server sockets since they will never
+ * be readable or writable at the Tcl level. This keeps Tcl scripts
+ * from interfering with the -accept behavior (bug #3394732).
+ */
+ return;
+ }
if (statePtr->flags & TCP_ASYNC_CONNECT) {
/* Async sockets use a FileHandler internally while connecting, so we