Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | add selected tls updates |
|---|---|
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
982ebf9d31a60440329e8e1c3ce4df05 |
| User & Date: | chw 2018-12-02 05:26:33 |
Context
|
2018-12-02
| ||
| 05:27 | add selected tcllib upstream changes check-in: bc495b78b4 user: chw tags: trunk | |
| 05:26 | add selected tls updates check-in: 982ebf9d31 user: chw tags: trunk | |
|
2018-11-29
| ||
| 23:15 | add selected SDL upstream changes check-in: 898a587e4f user: chw tags: trunk | |
Changes
Changes to jni/tls/tls.c.
| ︙ | ︙ | |||
290 291 292 293 294 295 296 |
static unsigned long
CryptoThreadIdCallback(void)
{
return (unsigned long) Tcl_GetCurrentThread();
}
#endif /* _WIN32 */
| | | 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 |
static unsigned long
CryptoThreadIdCallback(void)
{
return (unsigned long) Tcl_GetCurrentThread();
}
#endif /* _WIN32 */
#endif /* linux || __FreeBSD__ || __OpenBSD__ || __APPLE__ || ANDROID || __HAIKU__ || __sun */
#endif /* OPENSSL_THREADS */
#endif /* TCL_THREADS */
/*
*-------------------------------------------------------------------
*
|
| ︙ | ︙ |
Changes to jni/tls/tlsBIO.c.
| ︙ | ︙ | |||
179 180 181 182 183 184 185 |
ret = bio->shutdown;
break;
case BIO_CTRL_SET_CLOSE:
bio->shutdown = (int)num;
break;
case BIO_CTRL_EOF:
dprintf(stderr, "BIO_CTRL_EOF\n");
| | | > > | | 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 |
ret = bio->shutdown;
break;
case BIO_CTRL_SET_CLOSE:
bio->shutdown = (int)num;
break;
case BIO_CTRL_EOF:
dprintf(stderr, "BIO_CTRL_EOF\n");
ret = ((chan) ? Tcl_Eof(chan) : 1);
break;
case BIO_CTRL_PENDING:
ret = ((chan) ? ((Tcl_InputBuffered(chan) ? 1 : 0)) : 0);
dprintf(stderr, "BIO_CTRL_PENDING(%d)\n", (int) ret);
break;
case BIO_CTRL_WPENDING:
ret = 0;
break;
case BIO_CTRL_DUP:
break;
case BIO_CTRL_FLUSH:
dprintf(stderr, "BIO_CTRL_FLUSH\n");
if (!chan) {
ret = -1;
} else if (channelTypeVersion == TLS_CHANNEL_VERSION_2) {
ret = ((Tcl_WriteRaw(chan, "", 0) >= 0) ? 1 : -1);
} else {
ret = ((Tcl_Flush(chan) == TCL_OK) ? 1 : -1);
}
break;
default:
ret = 0;
|
| ︙ | ︙ |
Changes to jni/tls/tlsIO.c.
| ︙ | ︙ | |||
627 628 629 630 631 632 633 |
* Management of the internal timer.
*/
if (statePtr->timer != (Tcl_TimerToken) NULL) {
Tcl_DeleteTimerHandler(statePtr->timer);
statePtr->timer = (Tcl_TimerToken) NULL;
}
| | > > | 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 |
* Management of the internal timer.
*/
if (statePtr->timer != (Tcl_TimerToken) NULL) {
Tcl_DeleteTimerHandler(statePtr->timer);
statePtr->timer = (Tcl_TimerToken) NULL;
}
if ((mask & TCL_READABLE) &&
((Tcl_InputBuffered(statePtr->self) > 0) ||
(BIO_ctrl_pending(statePtr->bio) > 0))) {
/*
* There is interest in readable events and we actually have
* data waiting, so generate a timer to flush that.
*/
statePtr->timer = Tcl_CreateTimerHandler(TLS_TCL_DELAY,
TlsChannelHandlerTimer, (ClientData) statePtr);
}
|
| ︙ | ︙ |