|
 |
4056b0 |
------------------------------------------------------------
|
|
|
4056b0 |
revno: 13237
|
|
|
4056b0 |
revision-id: squid3@treenet.co.nz-20160506091244-3td2be9qbzsajxg8
|
|
|
4056b0 |
parent: squid3@treenet.co.nz-20160502034253-axee4hqa4wuhlpkg
|
|
|
4056b0 |
fixes bug: http://bugs.squid-cache.org/show_bug.cgi?id=4455
|
|
|
4056b0 |
committer: Amos Jeffries <squid3@treenet.co.nz>
|
|
|
4056b0 |
branch nick: 3.4
|
|
|
4056b0 |
timestamp: Fri 2016-05-06 21:12:44 +1200
|
|
|
4056b0 |
message:
|
|
|
4056b0 |
Bug 4455: SegFault from ESIInclude::Start
|
|
|
4056b0 |
------------------------------------------------------------
|
|
|
4056b0 |
# Bazaar merge directive format 2 (Bazaar 0.90)
|
|
|
4056b0 |
# revision_id: squid3@treenet.co.nz-20160506091244-3td2be9qbzsajxg8
|
|
|
4056b0 |
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
|
|
|
4056b0 |
# testament_sha1: b9714bc153e5fd6e8fe505a6c1d8a54c88e03a77
|
|
|
4056b0 |
# timestamp: 2016-05-06 09:48:43 +0000
|
|
|
4056b0 |
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
|
|
|
4056b0 |
# base_revision_id: squid3@treenet.co.nz-20160502034253-\
|
|
|
4056b0 |
# axee4hqa4wuhlpkg
|
|
|
4056b0 |
#
|
|
|
4056b0 |
# Begin patch
|
|
|
4056b0 |
=== modified file 'src/client_side_request.cc'
|
|
|
4056b0 |
--- src/client_side_request.cc 2014-04-09 16:53:05 +0000
|
|
|
4056b0 |
+++ src/client_side_request.cc 2016-05-06 09:12:44 +0000
|
|
|
4056b0 |
@@ -163,13 +163,15 @@
|
|
|
4056b0 |
start_time = current_time;
|
|
|
4056b0 |
setConn(aConn);
|
|
|
4056b0 |
al = new AccessLogEntry;
|
|
|
4056b0 |
- al->tcpClient = clientConnection = aConn->clientConnection;
|
|
|
4056b0 |
+ if (aConn) {
|
|
|
4056b0 |
+ al->tcpClient = clientConnection = aConn->clientConnection;
|
|
|
4056b0 |
#if USE_SSL
|
|
|
4056b0 |
- if (aConn->clientConnection != NULL && aConn->clientConnection->isOpen()) {
|
|
|
4056b0 |
- if (SSL *ssl = fd_table[aConn->clientConnection->fd].ssl)
|
|
|
4056b0 |
- al->cache.sslClientCert.reset(SSL_get_peer_certificate(ssl));
|
|
|
4056b0 |
+ if (aConn->clientConnection != NULL && aConn->clientConnection->isOpen()) {
|
|
|
4056b0 |
+ if (SSL *ssl = fd_table[aConn->clientConnection->fd].ssl)
|
|
|
4056b0 |
+ al->cache.sslClientCert.reset(SSL_get_peer_certificate(ssl));
|
|
|
4056b0 |
+ }
|
|
|
4056b0 |
+#endif
|
|
|
4056b0 |
}
|
|
|
4056b0 |
-#endif
|
|
|
4056b0 |
dlinkAdd(this, &active, &ClientActiveRequests);
|
|
|
4056b0 |
#if USE_ADAPTATION
|
|
|
4056b0 |
request_satisfaction_mode = false;
|
|
|
4056b0 |
|