← Back to branch summary

~ubuntu-branches/debian/stretch/psi-plus/stretch

« back to all changes in this revision

Viewing changes to iris/src/irisnet/noncore/cutestuff/httpconnect.cpp

  • Committer: Package Import Robot
  • Author(s): Boris Pek
  • Date: 2013-10-23 02:42:20 UTC
  • mfrom: (1.4.7)
  • Revision ID: package-import@ubuntu.com-20131023024220-bk2hyoenqkwfhpgw
Tags: 0.16.242-1
http://bugs.debian.org/724880
* New upstream release:
  fixed the problem of initialization of private conversation when both
  sides use libotr 4.0.x. (Closes: #724880)
* Update debian/watch: sources were moved.
* Delete psi-plus-content-downloader package and update all related files.
  This plugin is in psi-plus-plugins package now.
* Update debian/control:
  - remove all currently unneeded Replaces and Breaks fields
  - add build dependency on libidn11-dev
* Update debian/rules: simplify get-orig-source section.
* Update debian/copyright:
  - update Source field due to changes in sources location
  - remove copyright holders whose code was deleted from source tree
    (bundled libidn library was removed)

Show diffs side-by-side

added added

removed removed

Lines of Context:
iris/src/irisnet/noncore/cutestuff/httpconnect.cpp
128
128
        connect(&d->sock, SIGNAL(bytesWritten(qint64)), SLOT(sock_bytesWritten(qint64)));
129
129
        connect(&d->sock, SIGNAL(error(int)), SLOT(sock_error(int)));
130
130
 
131
 
        reset(true);
 
131
        resetConnection(true);
132
132
}
133
133
 
134
134
HttpConnect::~HttpConnect()
135
135
{
136
 
        reset(true);
 
136
        resetConnection(true);
137
137
        delete d;
138
138
}
139
139
 
140
 
void HttpConnect::reset(bool clear)
 
140
void HttpConnect::resetConnection(bool clear)
141
141
{
142
142
        if(d->sock.state() != BSocket::Idle)
143
143
                d->sock.close();
157
157
 
158
158
void HttpConnect::connectToHost(const QString &proxyHost, int proxyPort, const QString &host, int port)
159
159
{
160
 
        reset(true);
 
160
        resetConnection(true);
161
161
 
162
162
        d->host = proxyHost;
163
163
        d->port = proxyPort;
178
178
{
179
179
        d->sock.close();
180
180
        if(d->sock.bytesToWrite() == 0)
181
 
                reset();
 
181
                resetConnection();
182
182
}
183
183
 
184
184
qint64 HttpConnect::writeData(const char *data, qint64 maxSize)
225
225
void HttpConnect::sock_connectionClosed()
226
226
{
227
227
        if(d->active) {
228
 
                reset();
 
228
                resetConnection();
229
229
                connectionClosed();
230
230
        }
231
231
        else {
236
236
void HttpConnect::sock_delayedCloseFinished()
237
237
{
238
238
        if(d->active) {
239
 
                reset();
 
239
                resetConnection();
240
240
                delayedCloseFinished();
241
241
        }
242
242
}
274
274
#ifdef PROX_DEBUG
275
275
                                        fprintf(stderr, "HttpConnect: invalid header!\n");
276
276
#endif
277
 
                                        reset(true);
 
277
                                        resetConnection(true);
278
278
                                        setError(ErrProxyNeg);
279
279
                                        return;
280
280
                                }
328
328
#ifdef PROX_DEBUG
329
329
                                        fprintf(stderr, "HttpConnect: << Error >> [%s]\n", qPrintable(errStr));
330
330
#endif
331
 
                                        reset(true);
 
331
                                        resetConnection(true);
332
332
                                        setError(err);
333
333
                                        return;
334
334
                                }
359
359
void HttpConnect::sock_error(int x)
360
360
{
361
361
        if(d->active) {
362
 
                reset();
 
362
                resetConnection();
363
363
                setError(ErrRead);
364
364
        }
365
365
        else {
366
 
                reset(true);
 
366
                resetConnection(true);
367
367
                if(x == BSocket::ErrHostNotFound)
368
368
                        setError(ErrProxyConnect);
369
369
                else if(x == BSocket::ErrConnectionRefused)