Overview
| Comment: | Added EOF fixes for TLS package |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
91e419adbd643999a4fa9ef08c258c0b |
| User & Date: | rkeene on 2014-07-10 16:56:21 |
| Other Links: | manifest | tags |
Context
|
2014-07-19
| ||
| 06:59 | Added basic web interface check-in: 5613f08f7e user: rkeene tags: trunk | |
|
2014-07-10
| ||
| 16:56 | Added EOF fixes for TLS package check-in: 91e419adbd user: rkeene tags: trunk | |
| 16:56 | Updated to latest tcc4tcl check-in: 18a3ef02c8 user: rkeene tags: trunk | |
Changes
Added tls/patches/all/tls-1.6-eoffix.diff version [a489f87c5b].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 |
diff -uNr tls1.6/tlsIO.c tls1.6-eof-1dgp/tlsIO.c
--- tls1.6/tlsIO.c 2008-03-17 19:59:02.000000000 -0500
+++ tls1.6-eof-1dgp/tlsIO.c 2014-07-07 22:41:14.017514735 -0500
@@ -729,6 +729,19 @@
statePtr->timer = (Tcl_TimerToken) NULL;
}
+ if (statePtr->flags & TLS_TCL_CALLBACK) {
+ return 0;
+ }
+
+ if (statePtr->flags & TLS_TCL_INIT
+ && !SSL_is_init_finished(statePtr->ssl)) {
+ int errorCode;
+ if (Tls_WaitForConnect(statePtr, &errorCode) <= 0
+ && errorCode == EAGAIN) {
+ return 0;
+ }
+ }
+
return mask;
}
@@ -900,6 +913,9 @@
continue;
}
} else if (err == 0) {
+ if (Tcl_Eof(statePtr->self)) {
+ return 0;
+ }
dprintf(stderr,"CR! ");
*errorCodePtr = ECONNRESET;
return -1;
|