| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| | |
Conflicts:
tests/auto/qlocalsocket/tst_qlocalsocket.cpp
|
| |
| |
| |
| |
| |
| |
| | |
This was a contribution sent via the public bugs channel.
Task-number: 255161
Reviewed-by: Marius Storm-Olsen
|
| |
| |
| |
| |
| |
| | |
otherwise PeekNamedPipe() may block in threaded environments.
Reviewed-by: thiago
|
|\ \ |
|
| | | |
|
|\ \ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
configure.exe
examples/itemviews/puzzle/puzzle.pro
examples/qtconcurrent/imagescaling/imagescaling.pro
examples/widgets/movie/movie.pro
tools/configure/configureapp.cpp
Will rebuild configure.exe in next commit.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
...but just silently return. This is ok because at another location
in QNetworkReplyImplPrivate we do the same.
Reviewed-by: Thiago
Task-number: 254638
|
| | |
| | |
| | |
| | |
| | | |
Task-number: 254365
Reviewed-by: Peter Hartmann
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
to the socket connection. (Reviewed - see below.)
Also included corrections to the description of how to send SocketError
and SocketState values via signals. (Trust me - as part of an earlier
revision of the custom types documentation.)
Task-number: 222907
Reviewed-by: Andy Shaw
|
| | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
| | |
| | |
| | |
| | | |
Correct ordinal for BIO_free symbol is 209.
|
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The commit enables -openssl config in addition to -openssl-linked
in Symbian OS platforms. In Symbian OS the symbol names are stripped
away from DLLand symbols are are referenced via ordinal numbers.
This change resolves the correct ordinals for SSL symbols in Symbian OS.
The change is a bit hackish, but is currently only way to resolve
symbols at runtime in Symbian OS - if STDDLL targettype is not counted.
The problem of STDDLL target type is that it is not supported by S60 3.1
and in addition the SSL libraries in S60 are not currently build with
STDDLL target but DLL target.
This mechanism should work as long as BC for SSL symbols is kept.
And S60 has given binary promise, so we should not have problems...
|
|\ \
| |/
| |
| |
| |
| |
| |
| | |
Conflicts:
src/corelib/io/qfile.cpp
src/corelib/kernel/qsharedmemory_unix.cpp
src/network/socket/qnativesocketengine_p.h
src/network/socket/qnativesocketengine_unix.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
compilation breakage introduced in 6c1d7e57.
The fix in fc7a43cce did fix the failure, but created another one
because qhostinfo_win.cpp also had a copy of qt_sockaddr_in6
Reviewed-by: Jason McDonald
|
| |
| |
| |
| |
| |
| |
| | |
On Windows, QT_NO_IPV6 isn't defined, but the necessary includes were
missing. So #include winsock2.h and also use our own structures.
Reviewed-By: Trust Me
|
| |
| |
| |
| |
| | |
Task-number: 254333
Reviewed-by: Andy Shaw <qt-info@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This case it was possible to fix by using a union of the types when we
actually declare the variable.
Besides, this avoids a bunch of #ifdef for IPv6 functionality.
Reviewed-By: Oswald Buddenhagen
|
| |
| |
| |
| |
| | |
This definitely has to be reviewed and changed, especially when generic
problem with socket notifier and sync operations on sockets is solved.
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
tests/auto/network-settings.h
tests/auto/qhttpsocketengine/tst_qhttpsocketengine.cpp
tests/auto/qiodevice/tst_qiodevice.cpp
tests/auto/qnativesocketengine/tst_qnativesocketengine.cpp
tests/auto/qsocks5socketengine/tst_qsocks5socketengine.cpp
tests/auto/qsslsocket/tst_qsslsocket.cpp
|
| |
| |
| |
| |
| |
| | |
Usually, "the the" is not proper English
Reviewed-By: Thiago Macieira
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
When expiring cache files use a QMultiMap, when using a QMap not all
files are put into the map because often many files (downloaded or
updated at the same time) will have the same creation QDateTime and
so only one will go into the QMap who's key is QDateTime.
Reviewed-By: Thiago Macieira
Reviewed-By: Peter Hartmann
|
| |
| |
| |
| | |
and map them to read / write notifications.
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
configure.exe
src/corelib/kernel/qcoreapplication.cpp
Configure.exe not rebuilt because the changes are irrelevant for the
S60 port. We'll rebuild it before merging back.
|
| |
| |
| |
| |
| |
| |
| | |
return error upon receiving an unknown authentication method (e.g.
WSSE); before we were just silently returning.
Reviewed-by: Thiago Macieira
|
| |
| |
| |
| |
| |
| |
| |
| | |
responses to POST might be cacheable, but are not cacheable by default;
responses to PUT or DELETE are never cacheable.
Reviewed-by: Thiago Macieira
Task-number: 252281
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
There's no need for using QByteArrayMatcher for one single character,
so avoid the overhead.
Also validate the message header a bit more: we require the status
line to start with "HTTP/n.m " where n and m are positive integers
less than 10.
Task-number: 248838
Reviewed-by: Markus Goetz
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
proper HTTP reply.
If the server's reply doesn't start with "HTTP/", then the reply is
not valid. This could happen if we connected via HTTP to an HTTPS
server. It could also happen with an Icecast server (reply ICY/x.y).
Task-number: 248838
Reviewed-by: Markus Goetz
|
| |
| |
| |
| |
| | |
Task-number: 236925
Reviewed-by: Tor Arne Vestbø
|
| | |
|
| |
| |
| |
| | |
functions.
|
|\ \
| |/
| |
| |
| | |
Conflicts:
tests/auto/qtemporaryfile/qtemporaryfile.pro
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
original patch by Benjamin Meyer.
Handle multiple cookies split by new lines in a cleaner way.
Parsing the combined string was error prone. Splitting them and
sending each line through our header parser is more robust, and has
more obvious code paths.
Tested by logging into wordpress.com, facebook.com etc.
Reviewed-by: Thiago
Task-number: 251959
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
OpenBSD's OpenSSL libraries are linked in a bizarre way: libssl.so
doesn't link to libcrypto.so, even though it depends on it. I don't
claim to understand why, but they do it. So make sure we export its
symbols for libssl to see and we load libcrypto first.
Task-number: 252042
Patch by: Marc Espie <espie@openbsd.org>
Reviewed-by: Peter Hartmann
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
If you write:
QNetworkProxy proxy;
proxy.setType(QNetworkProxy::HttpProxy);
Then now QNetworkProxy will set the capabilities to the default value
for the new proxy type. Previously, it wouldn't do that: default
values were set only for the type passed in the constructor.
Reviewed-by: Peter Hartmann
|
| |
| |
| |
| |
| |
| | |
name resolution
Task-number: 252761
|
| |
| |
| |
| |
| |
| |
| |
| | |
In QNetworkDiskCache::prepare() When QTemporaryFile::open fails,
delete the cache item and return 0 rather then returning a closed
device. And a spelling mistake in a qWarning()
Reviewed-by: Peter Hartmann
|
| |
| |
| |
| |
| | |
Task-number: 252298
Reviewed-by: Peter Hartmann
|
| | |
|
|\ \
| |/ |
|
| |
| |
| |
| |
| |
| |
| |
| | |
the domain attribute in cookies must always contain one embedded dot,
according to RFC 2109 section 4.3.2
Reviewed-by: Thiago
Task-number: 251467
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
According to the (old) cookie RFC 2109, the domain attribute must
always contain a leading dot. Some servers do not have that, but all
browsers accept those cookies anyway, so we should do that as well.
Reviewed-by: Olivier
Reviewed-by: Denis
Task-number: 228974
|
| |
| |
| |
| |
| |
| |
| | |
Don't setfault when setting 0 for the network cache such as when you
want to disable it.
Reviewed-by: Peter Hartmann
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This change was needed since plain readfs/writefds select call to
Open C sometimes jammed. By adding expectfds to select call, the
select seems not to hang anymore but returns.
This workaround should be removed once Open C performs accorinding to
POSIX standard.
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Configure.exe recompiled with MSVC6.
Conflicts:
configure.exe
examples/network/network.pro
src/gui/dialogs/qfiledialog_p.h
src/gui/dialogs/qfilesystemmodel_p.h
src/gui/kernel/qapplication.cpp
tests/auto/_Categories/qmake.txt
tests/auto/qfile/test/test.pro
tests/auto/qfile/tst_qfile.cpp
tests/auto/qlibrary/tst_qlibrary.cpp
tests/auto/qline/tst_qline.cpp
tests/auto/qstyle/tst_qstyle.cpp
tests/auto/qtextstream/tst_qtextstream.cpp
tests/auto/qtranslator/qtranslator.pro
tests/auto/qwaitcondition/tst_qwaitcondition.cpp
translations/qt_ja_JP.ts
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This fixes the "QAbstractSocket::connectToHost() called when already
connecting/connected to <hostname>". The issue was that we were trying
to call connect on a socket that was in a Closing state. We have to
wait for the disconnected signal before we try to connect again.
Reviewed-by: Prasanth
|
| |
| |
| |
| | |
Reviewed-by: thiago
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
about the only error case for a PeekNamedPipe() which does not actually
want to read anything is some kind of disconnect. so ignore the error
code and just handle the error as a close.
Task-number: 247144
Reviewed-by: thiago
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
QProcessPrivate and QNativeSocketEnginePrivate were reporting a wrong
number of bytes available on 64-bit machines, due to use of size_t in
ioctl. That was required by Irix, which we dropped support for, so we
can also drop size_t
Reviewed-by: Thiago
Task-number: 249537
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Right now, we print this warning if connectToHost() is called when
we're in ConnectingState (waiting for remote to SYN,ACK) or in
ConnectedState. This also means connectToHost() allows interruption of
the HostLookupState cleanly (I think).
But if you called connectToHost() right after disconnectFromHost() and
there were data to write, the connectToHost() could discard the
pending outgoing data and reconnect. Or not, depending on whether the
DNS resolution ended first. In other words, race condition.
Reviewed-by: Peter Hartmann
|
| |
| |
| |
| |
| |
| |
| |
| | |
emit disconnected() if we were in ConnectedState or in ClosingState
before
Reviewed-by: Thiago
Task-number: 250976
|