← Back to branch summary

~yadi/squid/connection-manager

« back to all changes in this revision

Viewing changes to src/client_side_request.cc

  • Committer: Amos Jeffries
  • Date: 2014-01-19 05:45:51 UTC
  • mfrom: (13045.1.209 trunk)
  • Revision ID: squid3@treenet.co.nz-20140119054551-3u1so2dy5vda7kfw
Merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/client_side_request.cc
1639
1639
ClientHttpRequest::loggingEntry(StoreEntry *newEntry)
1640
1640
{
1641
1641
    if (loggingEntry_)
1642
 
        loggingEntry_->unlock();
 
1642
        loggingEntry_->unlock("ClientHttpRequest::loggingEntry");
1643
1643
 
1644
1644
    loggingEntry_ = newEntry;
1645
1645
 
1646
1646
    if (loggingEntry_)
1647
 
        loggingEntry_->lock();
 
1647
        loggingEntry_->lock("ClientHttpRequest::loggingEntry");
1648
1648
}
1649
1649
 
1650
1650
/*
1812
1812
            errorAppendEntry(e, calloutContext->error);
1813
1813
            calloutContext->error = NULL;
1814
1814
            getConn()->setServerBump(srvBump);
1815
 
            e->unlock();
 
1815
            e->unlock("ClientHttpRequest::doCallouts+sslBumpNeeded");
1816
1816
        } else
1817
1817
#endif
1818
1818
        {
1827
1827
                getConn()->flags.readMore = true; // resume any pipeline reads.
1828
1828
            node = (clientStreamNode *)client_stream.tail->data;
1829
1829
            clientStreamRead(node, this, node->readBuffer);
1830
 
            e->unlock();
 
1830
            e->unlock("ClientHttpRequest::doCallouts-sslBumpNeeded");
1831
1831
            return;
1832
1832
        }
1833
1833
    }