← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/squid3/oneiric-security

« back to all changes in this revision

Viewing changes to src/client_side.h

  • Committer: Bazaar Package Importer
  • Author(s): Mahyuddin Susanto
  • Date: 2011-02-15 18:46:13 UTC
  • mfrom: (21.2.4 sid)
  • Revision ID: james.westby@ubuntu.com-20110215184613-1u3dh5sz4i055flk
Tags: 3.1.10-1ubuntu1
https://launchpad.net/bugs/719283
* Merge from debian unstable. (LP: #719283)  Remaining changes:
  - debian/patches/18-fix-ftbfs-binutils-gold.dpatch: Add library linker into
    LIBS instead to LDFLAGS to fixing FTBFS binutils-gold.
* Drop Ubuntu configuration for ufw which landed in Debian and sync it: 
  - debian/squid3.ufw.profile.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/client_side.h
139
139
    bool areAllContextsForThisConnection() const;
140
140
    void freeAllContexts();
141
141
    void readNextRequest();
142
 
    void makeSpaceAvailable();
 
142
    bool maybeMakeSpaceAvailable();
143
143
    ClientSocketContext::Pointer getCurrentContext() const;
144
144
    void addContextToQueue(ClientSocketContext * context);
145
145
    int getConcurrentRequestCount() const;
222
222
    virtual void noteBodyConsumerAborted(BodyPipe::Pointer);
223
223
 
224
224
    void handleReadData(char *buf, size_t size);
225
 
    void handleRequestBodyData();
 
225
    bool handleRequestBodyData();
226
226
 
227
227
    /**
228
228
     * Correlate the current ConnStateData object with the pinning_fd socket descriptor.