diff --git a/Net/Makefile b/Net/Makefile index c9ad0f16d..93bc6680b 100644 --- a/Net/Makefile +++ b/Net/Makefile @@ -1,7 +1,7 @@ # # Makefile # -# $Id: //poco/1.3/Net/Makefile#1 $ +# $Id: //poco/Main/Net/Makefile#34 $ # # Makefile for Poco Net # diff --git a/Net/Net.vmsbuild b/Net/Net.vmsbuild index 6066d4344..11001b56c 100644 --- a/Net/Net.vmsbuild +++ b/Net/Net.vmsbuild @@ -1,7 +1,7 @@ # # Net.vmsbuild # -# $Id: //poco/1.3/Net/Net.vmsbuild#1 $ +# $Id: //poco/Main/Net/Net.vmsbuild#1 $ # LIB=PocoNet diff --git a/Net/include/Poco/Net/DNS.h b/Net/include/Poco/Net/DNS.h index 4819fcd99..8dd217b0e 100644 --- a/Net/include/Poco/Net/DNS.h +++ b/Net/include/Poco/Net/DNS.h @@ -1,7 +1,7 @@ // // DNS.h // -// $Id: //poco/1.3/Net/include/Poco/Net/DNS.h#1 $ +// $Id: //poco/Main/Net/include/Poco/Net/DNS.h#2 $ // // Library: Net // Package: NetCore diff --git a/Net/include/Poco/Net/DatagramSocket.h b/Net/include/Poco/Net/DatagramSocket.h index 3cfe91bbe..b99c580d4 100644 --- a/Net/include/Poco/Net/DatagramSocket.h +++ b/Net/include/Poco/Net/DatagramSocket.h @@ -1,7 +1,7 @@ // // DatagramSocket.h // -// $Id: //poco/1.3/Net/include/Poco/Net/DatagramSocket.h#1 $ +// $Id: //poco/Main/Net/include/Poco/Net/DatagramSocket.h#2 $ // // Library: Net // Package: Sockets diff --git a/Net/include/Poco/Net/DatagramSocketImpl.h b/Net/include/Poco/Net/DatagramSocketImpl.h index 1175c24a5..7d1395bba 100644 --- a/Net/include/Poco/Net/DatagramSocketImpl.h +++ b/Net/include/Poco/Net/DatagramSocketImpl.h @@ -1,7 +1,7 @@ // // DatagramSocketImpl.h // -// $Id: //poco/1.3/Net/include/Poco/Net/DatagramSocketImpl.h#1 $ +// $Id: //poco/Main/Net/include/Poco/Net/DatagramSocketImpl.h#2 $ // // Library: Net // Package: Sockets diff --git a/Net/include/Poco/Net/DialogSocket.h b/Net/include/Poco/Net/DialogSocket.h index 146b5e474..0208b5f79 100644 --- a/Net/include/Poco/Net/DialogSocket.h +++ b/Net/include/Poco/Net/DialogSocket.h @@ -1,7 +1,7 @@ // // DialogSocket.h // -// $Id: //poco/1.3/Net/include/Poco/Net/DialogSocket.h#1 $ +// $Id: //poco/Main/Net/include/Poco/Net/DialogSocket.h#2 $ // // Library: Net // Package: Sockets diff --git a/Net/include/Poco/Net/FTPClientSession.h b/Net/include/Poco/Net/FTPClientSession.h index 54c82fc4f..7c39ea6eb 100644 --- a/Net/include/Poco/Net/FTPClientSession.h +++ b/Net/include/Poco/Net/FTPClientSession.h @@ -1,7 +1,7 @@ // // FTPClientSession.h // -// $Id: //poco/1.3/Net/include/Poco/Net/FTPClientSession.h#1 $ +// $Id: //poco/Main/Net/include/Poco/Net/FTPClientSession.h#2 $ // // Library: Net // Package: FTP diff --git a/Net/include/Poco/Net/FTPStreamFactory.h b/Net/include/Poco/Net/FTPStreamFactory.h index db5f828af..21bcf1ba1 100644 --- a/Net/include/Poco/Net/FTPStreamFactory.h +++ b/Net/include/Poco/Net/FTPStreamFactory.h @@ -1,7 +1,7 @@ // // FTPStreamFactory.h // -// $Id: //poco/1.3/Net/include/Poco/Net/FTPStreamFactory.h#1 $ +// $Id: //poco/Main/Net/include/Poco/Net/FTPStreamFactory.h#2 $ // // Library: Net // Package: FTP diff --git a/Net/include/Poco/Net/FilePartSource.h b/Net/include/Poco/Net/FilePartSource.h index 0906b0afa..f5a9b46cd 100644 --- a/Net/include/Poco/Net/FilePartSource.h +++ b/Net/include/Poco/Net/FilePartSource.h @@ -1,7 +1,7 @@ // // FilePartSource.h // -// $Id: //poco/1.3/Net/include/Poco/Net/FilePartSource.h#1 $ +// $Id: //poco/Main/Net/include/Poco/Net/FilePartSource.h#2 $ // // Library: Net // Package: Messages diff --git a/Net/include/Poco/Net/HTMLForm.h b/Net/include/Poco/Net/HTMLForm.h index d69daa8bc..0547f540e 100644 --- a/Net/include/Poco/Net/HTMLForm.h +++ b/Net/include/Poco/Net/HTMLForm.h @@ -1,7 +1,7 @@ // // HTMLForm.h // -// $Id: //poco/1.3/Net/include/Poco/Net/HTMLForm.h#1 $ +// $Id: //poco/Main/Net/include/Poco/Net/HTMLForm.h#2 $ // // Library: Net // Package: HTML diff --git a/Net/include/Poco/Net/HTTPBasicCredentials.h b/Net/include/Poco/Net/HTTPBasicCredentials.h index 651d75b91..8967f8862 100644 --- a/Net/include/Poco/Net/HTTPBasicCredentials.h +++ b/Net/include/Poco/Net/HTTPBasicCredentials.h @@ -1,7 +1,7 @@ // // HTTPBasicCredentials.h // -// $Id: //poco/1.3/Net/include/Poco/Net/HTTPBasicCredentials.h#1 $ +// $Id: //poco/Main/Net/include/Poco/Net/HTTPBasicCredentials.h#2 $ // // Library: Net // Package: HTTP diff --git a/Net/include/Poco/Net/HTTPChunkedStream.h b/Net/include/Poco/Net/HTTPChunkedStream.h index 1b61634f2..a036c1b85 100644 --- a/Net/include/Poco/Net/HTTPChunkedStream.h +++ b/Net/include/Poco/Net/HTTPChunkedStream.h @@ -1,7 +1,7 @@ // // HTTPChunkedStream.h // -// $Id: //poco/1.3/Net/include/Poco/Net/HTTPChunkedStream.h#1 $ +// $Id: //poco/Main/Net/include/Poco/Net/HTTPChunkedStream.h#3 $ // // Library: Net // Package: HTTP @@ -73,6 +73,7 @@ private: HTTPSession& _session; openmode _mode; std::streamsize _chunk; + std::string _chunkBuffer; }; diff --git a/Net/include/Poco/Net/HTTPClientSession.h b/Net/include/Poco/Net/HTTPClientSession.h index 7e6d66973..389263432 100644 --- a/Net/include/Poco/Net/HTTPClientSession.h +++ b/Net/include/Poco/Net/HTTPClientSession.h @@ -1,7 +1,7 @@ // // HTTPClientSession.h // -// $Id: //poco/1.3/Net/include/Poco/Net/HTTPClientSession.h#1 $ +// $Id: //poco/Main/Net/include/Poco/Net/HTTPClientSession.h#3 $ // // Library: Net // Package: HTTPClient @@ -194,6 +194,7 @@ private: std::string _proxyHost; Poco::UInt16 _proxyPort; bool _reconnect; + bool _mustReconnect; bool _expectResponseBody; std::ostream* _pRequestStream; std::istream* _pResponseStream; diff --git a/Net/include/Poco/Net/HTTPCookie.h b/Net/include/Poco/Net/HTTPCookie.h index 7b4e70422..2a753f267 100644 --- a/Net/include/Poco/Net/HTTPCookie.h +++ b/Net/include/Poco/Net/HTTPCookie.h @@ -1,7 +1,7 @@ // // HTTPCookie.h // -// $Id: //poco/1.3/Net/include/Poco/Net/HTTPCookie.h#1 $ +// $Id: //poco/Main/Net/include/Poco/Net/HTTPCookie.h#2 $ // // Library: Net // Package: HTTP diff --git a/Net/include/Poco/Net/HTTPFixedLengthStream.h b/Net/include/Poco/Net/HTTPFixedLengthStream.h index 488f556ce..4abdf705c 100644 --- a/Net/include/Poco/Net/HTTPFixedLengthStream.h +++ b/Net/include/Poco/Net/HTTPFixedLengthStream.h @@ -1,7 +1,7 @@ // // HTTPFixedLengthStream.h // -// $Id: //poco/1.3/Net/include/Poco/Net/HTTPFixedLengthStream.h#1 $ +// $Id: //poco/Main/Net/include/Poco/Net/HTTPFixedLengthStream.h#2 $ // // Library: Net // Package: HTTP diff --git a/Net/include/Poco/Net/HTTPHeaderStream.h b/Net/include/Poco/Net/HTTPHeaderStream.h index 631966828..d937cc767 100644 --- a/Net/include/Poco/Net/HTTPHeaderStream.h +++ b/Net/include/Poco/Net/HTTPHeaderStream.h @@ -1,7 +1,7 @@ // // HTTPHeaderStream.h // -// $Id: //poco/1.3/Net/include/Poco/Net/HTTPHeaderStream.h#1 $ +// $Id: //poco/Main/Net/include/Poco/Net/HTTPHeaderStream.h#2 $ // // Library: Net // Package: HTTP diff --git a/Net/include/Poco/Net/HTTPMessage.h b/Net/include/Poco/Net/HTTPMessage.h index 608665e97..61ce73f69 100644 --- a/Net/include/Poco/Net/HTTPMessage.h +++ b/Net/include/Poco/Net/HTTPMessage.h @@ -1,7 +1,7 @@ // // HTTPMessage.h // -// $Id: //poco/1.3/Net/include/Poco/Net/HTTPMessage.h#1 $ +// $Id: //poco/Main/Net/include/Poco/Net/HTTPMessage.h#2 $ // // Library: Net // Package: HTTP diff --git a/Net/include/Poco/Net/HTTPRequest.h b/Net/include/Poco/Net/HTTPRequest.h index bb14f0de4..3b85eab83 100644 --- a/Net/include/Poco/Net/HTTPRequest.h +++ b/Net/include/Poco/Net/HTTPRequest.h @@ -1,7 +1,7 @@ // // HTTPRequest.h // -// $Id: //poco/1.3/Net/include/Poco/Net/HTTPRequest.h#1 $ +// $Id: //poco/Main/Net/include/Poco/Net/HTTPRequest.h#2 $ // // Library: Net // Package: HTTP diff --git a/Net/include/Poco/Net/HTTPRequestHandler.h b/Net/include/Poco/Net/HTTPRequestHandler.h index 3b00e1a9f..e0118ed3c 100644 --- a/Net/include/Poco/Net/HTTPRequestHandler.h +++ b/Net/include/Poco/Net/HTTPRequestHandler.h @@ -1,7 +1,7 @@ // // HTTPRequestHandler.h // -// $Id: //poco/1.3/Net/include/Poco/Net/HTTPRequestHandler.h#1 $ +// $Id: //poco/Main/Net/include/Poco/Net/HTTPRequestHandler.h#2 $ // // Library: Net // Package: HTTPServer diff --git a/Net/include/Poco/Net/HTTPRequestHandlerFactory.h b/Net/include/Poco/Net/HTTPRequestHandlerFactory.h index 98072ab60..3d3c4449f 100644 --- a/Net/include/Poco/Net/HTTPRequestHandlerFactory.h +++ b/Net/include/Poco/Net/HTTPRequestHandlerFactory.h @@ -1,7 +1,7 @@ // // HTTPRequestHandlerFactory.h // -// $Id: //poco/1.3/Net/include/Poco/Net/HTTPRequestHandlerFactory.h#1 $ +// $Id: //poco/Main/Net/include/Poco/Net/HTTPRequestHandlerFactory.h#2 $ // // Library: Net // Package: HTTPServer diff --git a/Net/include/Poco/Net/HTTPResponse.h b/Net/include/Poco/Net/HTTPResponse.h index 44b4af338..c092fefef 100644 --- a/Net/include/Poco/Net/HTTPResponse.h +++ b/Net/include/Poco/Net/HTTPResponse.h @@ -1,7 +1,7 @@ // // HTTPResponse.h // -// $Id: //poco/1.3/Net/include/Poco/Net/HTTPResponse.h#1 $ +// $Id: //poco/Main/Net/include/Poco/Net/HTTPResponse.h#2 $ // // Library: Net // Package: HTTP diff --git a/Net/include/Poco/Net/HTTPServer.h b/Net/include/Poco/Net/HTTPServer.h index 7728ab878..2a2bedcfa 100644 --- a/Net/include/Poco/Net/HTTPServer.h +++ b/Net/include/Poco/Net/HTTPServer.h @@ -1,7 +1,7 @@ // // HTTPServer.h // -// $Id: //poco/1.3/Net/include/Poco/Net/HTTPServer.h#1 $ +// $Id: //poco/Main/Net/include/Poco/Net/HTTPServer.h#2 $ // // Library: Net // Package: HTTPServer diff --git a/Net/include/Poco/Net/HTTPServerConnection.h b/Net/include/Poco/Net/HTTPServerConnection.h index 4508bc637..a40984928 100644 --- a/Net/include/Poco/Net/HTTPServerConnection.h +++ b/Net/include/Poco/Net/HTTPServerConnection.h @@ -1,7 +1,7 @@ // // HTTPServerConnection.h // -// $Id: //poco/1.3/Net/include/Poco/Net/HTTPServerConnection.h#1 $ +// $Id: //poco/Main/Net/include/Poco/Net/HTTPServerConnection.h#3 $ // // Library: Net // Package: HTTPServer @@ -42,6 +42,7 @@ #include "Poco/Net/Net.h" #include "Poco/Net/TCPServerConnection.h" +#include "Poco/Net/HTTPResponse.h" namespace Poco { @@ -50,6 +51,7 @@ namespace Net { class HTTPServerParams; class HTTPRequestHandlerFactory; +class HTTPServerSession; class Net_API HTTPServerConnection: public TCPServerConnection @@ -65,7 +67,10 @@ public: void run(); /// Handles all HTTP requests coming in. - + +protected: + void sendErrorResponse(HTTPServerSession& session, HTTPResponse::HTTPStatus status); + private: HTTPServerParams* _pParams; HTTPRequestHandlerFactory* _pFactory; diff --git a/Net/include/Poco/Net/HTTPServerConnectionFactory.h b/Net/include/Poco/Net/HTTPServerConnectionFactory.h index 483af6f43..ad3344c68 100644 --- a/Net/include/Poco/Net/HTTPServerConnectionFactory.h +++ b/Net/include/Poco/Net/HTTPServerConnectionFactory.h @@ -1,7 +1,7 @@ // // HTTPServerConnectionFactory.h // -// $Id: //poco/1.3/Net/include/Poco/Net/HTTPServerConnectionFactory.h#1 $ +// $Id: //poco/Main/Net/include/Poco/Net/HTTPServerConnectionFactory.h#2 $ // // Library: Net // Package: HTTPServer diff --git a/Net/include/Poco/Net/HTTPServerParams.h b/Net/include/Poco/Net/HTTPServerParams.h index 6d8efaf7a..91ed639eb 100644 --- a/Net/include/Poco/Net/HTTPServerParams.h +++ b/Net/include/Poco/Net/HTTPServerParams.h @@ -1,7 +1,7 @@ // // HTTPServerParams.h // -// $Id: //poco/1.3/Net/include/Poco/Net/HTTPServerParams.h#1 $ +// $Id: //poco/Main/Net/include/Poco/Net/HTTPServerParams.h#2 $ // // Library: Net // Package: HTTPServer diff --git a/Net/include/Poco/Net/HTTPServerRequest.h b/Net/include/Poco/Net/HTTPServerRequest.h index ef6df718b..cdf189eb9 100644 --- a/Net/include/Poco/Net/HTTPServerRequest.h +++ b/Net/include/Poco/Net/HTTPServerRequest.h @@ -1,7 +1,7 @@ // // HTTPServerRequest.h // -// $Id: //poco/1.3/Net/include/Poco/Net/HTTPServerRequest.h#1 $ +// $Id: //poco/Main/Net/include/Poco/Net/HTTPServerRequest.h#2 $ // // Library: Net // Package: HTTPServer diff --git a/Net/include/Poco/Net/HTTPServerResponse.h b/Net/include/Poco/Net/HTTPServerResponse.h index e0b7d8138..ab7487f85 100644 --- a/Net/include/Poco/Net/HTTPServerResponse.h +++ b/Net/include/Poco/Net/HTTPServerResponse.h @@ -1,7 +1,7 @@ // // HTTPServerResponse.h // -// $Id: //poco/1.3/Net/include/Poco/Net/HTTPServerResponse.h#1 $ +// $Id: //poco/Main/Net/include/Poco/Net/HTTPServerResponse.h#3 $ // // Library: Net // Package: HTTPServer @@ -83,20 +83,34 @@ public: /// The returned stream is valid until the response /// object is destroyed. /// - /// Must not be called after sendFile() or redirect() - /// has been called. + /// Must not be called after sendFile(), sendBuffer() + /// or redirect() has been called. void sendFile(const std::string& path, const std::string& mediaType); /// Sends the response header to the client, followed /// by the content of the given file. /// - /// Must not be called after send() or redirect() - /// has been called. + /// Must not be called after send(), sendBuffer() + /// or redirect() has been called. /// /// Throws a FileNotFoundException if the file /// cannot be found, or an OpenFileException if /// the file cannot be opened. + void sendBuffer(const void* pBuffer, std::size_t length); + /// Sends the response header to the client, followed + /// by the contents of the given buffer. + /// + /// The Content-Length header of the response is set + /// to length and chunked transfer encoding is disabled. + /// + /// If both the HTTP message header and body (from the + /// given buffer) fit into one single network packet, the + /// complete response can be sent in one network packet. + /// + /// Must not be called after send(), sendFile() + /// or redirect() has been called. + void redirect(const std::string& uri); /// Sets the status code to 302 (Found) /// and sets the "Location" header field @@ -109,6 +123,9 @@ public: /// Sets the status code to 401 (Unauthorized) /// and sets the "WWW-Authenticate" header field /// according to the given realm. + + bool sent() const; + /// Returns true if the response (header) has been sent. private: HTTPServerSession& _session; @@ -116,6 +133,15 @@ private: }; +// +// inlines +// +inline bool HTTPServerResponse::sent() const +{ + return _pStream != 0; +} + + } } // namespace Poco::Net diff --git a/Net/include/Poco/Net/HTTPServerSession.h b/Net/include/Poco/Net/HTTPServerSession.h index 340798039..67aae842c 100644 --- a/Net/include/Poco/Net/HTTPServerSession.h +++ b/Net/include/Poco/Net/HTTPServerSession.h @@ -1,7 +1,7 @@ // // HTTPServerSession.h // -// $Id: //poco/1.3/Net/include/Poco/Net/HTTPServerSession.h#1 $ +// $Id: //poco/Main/Net/include/Poco/Net/HTTPServerSession.h#4 $ // // Library: Net // Package: HTTPServer @@ -67,7 +67,10 @@ public: bool hasMoreRequests(); /// Returns true if there are requests available. - + + bool canKeepAlive() const; + /// Returns true if the session can be kept alive. + SocketAddress clientAddress(); /// Returns the client's address. @@ -81,6 +84,15 @@ private: }; +// +// inlines +// +inline bool HTTPServerSession::canKeepAlive() const +{ + return _maxKeepAliveRequests != 0; +} + + } } // namespace Poco::Net diff --git a/Net/include/Poco/Net/HTTPSession.h b/Net/include/Poco/Net/HTTPSession.h index b4b160e1b..b227eb86f 100644 --- a/Net/include/Poco/Net/HTTPSession.h +++ b/Net/include/Poco/Net/HTTPSession.h @@ -1,7 +1,7 @@ // // HTTPSession.h // -// $Id: //poco/1.3/Net/include/Poco/Net/HTTPSession.h#1 $ +// $Id: //poco/Main/Net/include/Poco/Net/HTTPSession.h#2 $ // // Library: Net // Package: HTTP diff --git a/Net/include/Poco/Net/HTTPSessionFactory.h b/Net/include/Poco/Net/HTTPSessionFactory.h index bd19708a7..27999d7b1 100644 --- a/Net/include/Poco/Net/HTTPSessionFactory.h +++ b/Net/include/Poco/Net/HTTPSessionFactory.h @@ -1,7 +1,7 @@ // // HTTPSessionFactory.h // -// $Id: //poco/1.3/Net/include/Poco/Net/HTTPSessionFactory.h#1 $ +// $Id: //poco/Main/Net/include/Poco/Net/HTTPSessionFactory.h#2 $ // // Library: Net // Package: HTTPClient diff --git a/Net/include/Poco/Net/HTTPSessionInstantiator.h b/Net/include/Poco/Net/HTTPSessionInstantiator.h index 62db10941..7f3527fc7 100644 --- a/Net/include/Poco/Net/HTTPSessionInstantiator.h +++ b/Net/include/Poco/Net/HTTPSessionInstantiator.h @@ -1,7 +1,7 @@ // // HTTPSessionInstantiator.h // -// $Id: //poco/1.3/Net/include/Poco/Net/HTTPSessionInstantiator.h#1 $ +// $Id: //poco/Main/Net/include/Poco/Net/HTTPSessionInstantiator.h#2 $ // // Library: Net // Package: HTTPClient diff --git a/Net/include/Poco/Net/HTTPStream.h b/Net/include/Poco/Net/HTTPStream.h index f23b3b256..545cc16b4 100644 --- a/Net/include/Poco/Net/HTTPStream.h +++ b/Net/include/Poco/Net/HTTPStream.h @@ -1,7 +1,7 @@ // // HTTPStream.h // -// $Id: //poco/1.3/Net/include/Poco/Net/HTTPStream.h#1 $ +// $Id: //poco/Main/Net/include/Poco/Net/HTTPStream.h#2 $ // // Library: Net // Package: HTTP diff --git a/Net/include/Poco/Net/HTTPStreamFactory.h b/Net/include/Poco/Net/HTTPStreamFactory.h index 89b7b86e9..cb380a28e 100644 --- a/Net/include/Poco/Net/HTTPStreamFactory.h +++ b/Net/include/Poco/Net/HTTPStreamFactory.h @@ -1,7 +1,7 @@ // // HTTPStreamFactory.h // -// $Id: //poco/1.3/Net/include/Poco/Net/HTTPStreamFactory.h#1 $ +// $Id: //poco/Main/Net/include/Poco/Net/HTTPStreamFactory.h#2 $ // // Library: Net // Package: HTTP diff --git a/Net/include/Poco/Net/HostEntry.h b/Net/include/Poco/Net/HostEntry.h index ff9c6cecb..fbd2459d1 100644 --- a/Net/include/Poco/Net/HostEntry.h +++ b/Net/include/Poco/Net/HostEntry.h @@ -1,7 +1,7 @@ // // HostEntry.h // -// $Id: //poco/1.3/Net/include/Poco/Net/HostEntry.h#1 $ +// $Id: //poco/Main/Net/include/Poco/Net/HostEntry.h#2 $ // // Library: Net // Package: NetCore diff --git a/Net/include/Poco/Net/ICMPClient.h b/Net/include/Poco/Net/ICMPClient.h index 24de74651..118f11de4 100644 --- a/Net/include/Poco/Net/ICMPClient.h +++ b/Net/include/Poco/Net/ICMPClient.h @@ -1,7 +1,7 @@ // // ICMPClient.h // -// $Id: //poco/1.3/Net/include/Poco/Net/ICMPClient.h#1 $ +// $Id: //poco/Main/Net/include/Poco/Net/ICMPClient.h#2 $ // // Library: Net // Package: ICMP diff --git a/Net/include/Poco/Net/ICMPEventArgs.h b/Net/include/Poco/Net/ICMPEventArgs.h index e004a3953..d0bea24ac 100644 --- a/Net/include/Poco/Net/ICMPEventArgs.h +++ b/Net/include/Poco/Net/ICMPEventArgs.h @@ -1,7 +1,7 @@ // // ICMPEventArgs.h // -// $Id: //poco/1.3/Net/include/Poco/Net/ICMPEventArgs.h#1 $ +// $Id: //poco/Main/Net/include/Poco/Net/ICMPEventArgs.h#2 $ // // Library: Net // Package: ICMP diff --git a/Net/include/Poco/Net/ICMPPacket.h b/Net/include/Poco/Net/ICMPPacket.h index 576a0956e..85e94f2f8 100644 --- a/Net/include/Poco/Net/ICMPPacket.h +++ b/Net/include/Poco/Net/ICMPPacket.h @@ -1,7 +1,7 @@ // // ICMPPacket.h // -// $Id: //poco/1.3/Net/include/Poco/Net/ICMPPacket.h#1 $ +// $Id: //poco/Main/Net/include/Poco/Net/ICMPPacket.h#2 $ // // Library: Net // Package: ICMP diff --git a/Net/include/Poco/Net/ICMPPacketImpl.h b/Net/include/Poco/Net/ICMPPacketImpl.h index a08949001..1e0842b86 100644 --- a/Net/include/Poco/Net/ICMPPacketImpl.h +++ b/Net/include/Poco/Net/ICMPPacketImpl.h @@ -1,7 +1,7 @@ // // ICMPPacketImpl.h // -// $Id: //poco/1.3/Net/include/Poco/Net/ICMPPacketImpl.h#1 $ +// $Id: //poco/Main/Net/include/Poco/Net/ICMPPacketImpl.h#3 $ // // Library: Net // Package: ICMP diff --git a/Net/include/Poco/Net/ICMPSocket.h b/Net/include/Poco/Net/ICMPSocket.h index fc29b876f..4fc37479e 100644 --- a/Net/include/Poco/Net/ICMPSocket.h +++ b/Net/include/Poco/Net/ICMPSocket.h @@ -1,7 +1,7 @@ // // ICMPSocket.h // -// $Id: //poco/1.3/Net/include/Poco/Net/ICMPSocket.h#1 $ +// $Id: //poco/Main/Net/include/Poco/Net/ICMPSocket.h#2 $ // // Library: Net // Package: ICMP diff --git a/Net/include/Poco/Net/ICMPSocketImpl.h b/Net/include/Poco/Net/ICMPSocketImpl.h index c6356e2c9..0704a688b 100644 --- a/Net/include/Poco/Net/ICMPSocketImpl.h +++ b/Net/include/Poco/Net/ICMPSocketImpl.h @@ -1,7 +1,7 @@ // // ICMPSocketImpl.h // -// $Id: //poco/1.3/Net/include/Poco/Net/ICMPSocketImpl.h#1 $ +// $Id: //poco/Main/Net/include/Poco/Net/ICMPSocketImpl.h#2 $ // // Library: Net // Package: ICMP diff --git a/Net/include/Poco/Net/ICMPv4PacketImpl.h b/Net/include/Poco/Net/ICMPv4PacketImpl.h index c52278663..4173ccce0 100644 --- a/Net/include/Poco/Net/ICMPv4PacketImpl.h +++ b/Net/include/Poco/Net/ICMPv4PacketImpl.h @@ -1,7 +1,7 @@ // // ICMPv4PacketImpl.h // -// $Id: //poco/1.3/Net/include/Poco/Net/ICMPv4PacketImpl.h#1 $ +// $Id: //poco/Main/Net/include/Poco/Net/ICMPv4PacketImpl.h#2 $ // // Library: Net // Package: ICMP diff --git a/Net/include/Poco/Net/IPAddress.h b/Net/include/Poco/Net/IPAddress.h index 165d281a2..a1d23b361 100644 --- a/Net/include/Poco/Net/IPAddress.h +++ b/Net/include/Poco/Net/IPAddress.h @@ -1,7 +1,7 @@ // // IPAddress.h // -// $Id: //poco/1.3/Net/include/Poco/Net/IPAddress.h#1 $ +// $Id: //poco/Main/Net/include/Poco/Net/IPAddress.h#2 $ // // Library: Net // Package: NetCore diff --git a/Net/include/Poco/Net/MailMessage.h b/Net/include/Poco/Net/MailMessage.h index b28bf46ce..bea8e6934 100644 --- a/Net/include/Poco/Net/MailMessage.h +++ b/Net/include/Poco/Net/MailMessage.h @@ -1,7 +1,7 @@ // // MailMessage.h // -// $Id: //poco/1.3/Net/include/Poco/Net/MailMessage.h#1 $ +// $Id: //poco/Main/Net/include/Poco/Net/MailMessage.h#3 $ // // Library: Net // Package: Mail diff --git a/Net/include/Poco/Net/MailRecipient.h b/Net/include/Poco/Net/MailRecipient.h index a46a90595..974fd3338 100644 --- a/Net/include/Poco/Net/MailRecipient.h +++ b/Net/include/Poco/Net/MailRecipient.h @@ -1,7 +1,7 @@ // // MailRecipient.h // -// $Id: //poco/1.3/Net/include/Poco/Net/MailRecipient.h#1 $ +// $Id: //poco/Main/Net/include/Poco/Net/MailRecipient.h#2 $ // // Library: Net // Package: Mail diff --git a/Net/include/Poco/Net/MailStream.h b/Net/include/Poco/Net/MailStream.h index d3b28f0bb..b45907e58 100644 --- a/Net/include/Poco/Net/MailStream.h +++ b/Net/include/Poco/Net/MailStream.h @@ -1,7 +1,7 @@ // // MailStream.h // -// $Id: //poco/1.3/Net/include/Poco/Net/MailStream.h#1 $ +// $Id: //poco/Main/Net/include/Poco/Net/MailStream.h#2 $ // // Library: Net // Package: Mail diff --git a/Net/include/Poco/Net/MediaType.h b/Net/include/Poco/Net/MediaType.h index 6256d2523..dad6127ef 100644 --- a/Net/include/Poco/Net/MediaType.h +++ b/Net/include/Poco/Net/MediaType.h @@ -1,7 +1,7 @@ // // MediaType.h // -// $Id: //poco/1.3/Net/include/Poco/Net/MediaType.h#1 $ +// $Id: //poco/Main/Net/include/Poco/Net/MediaType.h#2 $ // // Library: Net // Package: Messages diff --git a/Net/include/Poco/Net/MessageHeader.h b/Net/include/Poco/Net/MessageHeader.h index 56f42361d..a6bfa732a 100644 --- a/Net/include/Poco/Net/MessageHeader.h +++ b/Net/include/Poco/Net/MessageHeader.h @@ -1,7 +1,7 @@ // // MessageHeader.h // -// $Id: //poco/1.3/Net/include/Poco/Net/MessageHeader.h#1 $ +// $Id: //poco/Main/Net/include/Poco/Net/MessageHeader.h#2 $ // // Library: Net // Package: Messages diff --git a/Net/include/Poco/Net/MulticastSocket.h b/Net/include/Poco/Net/MulticastSocket.h index 06b11abdf..77b8a0cdd 100644 --- a/Net/include/Poco/Net/MulticastSocket.h +++ b/Net/include/Poco/Net/MulticastSocket.h @@ -1,7 +1,7 @@ // // MulticastSocket.h // -// $Id: //poco/1.3/Net/include/Poco/Net/MulticastSocket.h#1 $ +// $Id: //poco/Main/Net/include/Poco/Net/MulticastSocket.h#2 $ // // Library: Net // Package: Sockets diff --git a/Net/include/Poco/Net/MultipartReader.h b/Net/include/Poco/Net/MultipartReader.h index 3895bf643..df004156c 100644 --- a/Net/include/Poco/Net/MultipartReader.h +++ b/Net/include/Poco/Net/MultipartReader.h @@ -1,7 +1,7 @@ // // MultipartReader.h // -// $Id: //poco/1.3/Net/include/Poco/Net/MultipartReader.h#2 $ +// $Id: //poco/Main/Net/include/Poco/Net/MultipartReader.h#5 $ // // Library: Net // Package: Messages diff --git a/Net/include/Poco/Net/MultipartWriter.h b/Net/include/Poco/Net/MultipartWriter.h index 66578023b..2d1d1e41d 100644 --- a/Net/include/Poco/Net/MultipartWriter.h +++ b/Net/include/Poco/Net/MultipartWriter.h @@ -1,7 +1,7 @@ // // MultipartWriter.h // -// $Id: //poco/1.3/Net/include/Poco/Net/MultipartWriter.h#2 $ +// $Id: //poco/Main/Net/include/Poco/Net/MultipartWriter.h#3 $ // // Library: Net // Package: Messages diff --git a/Net/include/Poco/Net/NameValueCollection.h b/Net/include/Poco/Net/NameValueCollection.h index a64c449e6..c0343dfd5 100644 --- a/Net/include/Poco/Net/NameValueCollection.h +++ b/Net/include/Poco/Net/NameValueCollection.h @@ -1,7 +1,7 @@ // // NameValueCollection.h // -// $Id: //poco/1.3/Net/include/Poco/Net/NameValueCollection.h#1 $ +// $Id: //poco/Main/Net/include/Poco/Net/NameValueCollection.h#2 $ // // Library: Net // Package: Messages diff --git a/Net/include/Poco/Net/Net.h b/Net/include/Poco/Net/Net.h index ae170c599..938064049 100644 --- a/Net/include/Poco/Net/Net.h +++ b/Net/include/Poco/Net/Net.h @@ -1,7 +1,7 @@ // // Net.h // -// $Id: //poco/1.3/Net/include/Poco/Net/Net.h#1 $ +// $Id: //poco/Main/Net/include/Poco/Net/Net.h#2 $ // // Library: Net // Package: NetCore diff --git a/Net/include/Poco/Net/NetException.h b/Net/include/Poco/Net/NetException.h index 7288dd0c4..7ec0afa9f 100644 --- a/Net/include/Poco/Net/NetException.h +++ b/Net/include/Poco/Net/NetException.h @@ -1,7 +1,7 @@ // // NetException.h // -// $Id: //poco/1.3/Net/include/Poco/Net/NetException.h#1 $ +// $Id: //poco/Main/Net/include/Poco/Net/NetException.h#2 $ // // Library: Net // Package: NetCore diff --git a/Net/include/Poco/Net/NetworkInterface.h b/Net/include/Poco/Net/NetworkInterface.h index cbda25f61..fea88d7d0 100644 --- a/Net/include/Poco/Net/NetworkInterface.h +++ b/Net/include/Poco/Net/NetworkInterface.h @@ -1,7 +1,7 @@ // // NetworkInterface.h // -// $Id: //poco/1.3/Net/include/Poco/Net/NetworkInterface.h#1 $ +// $Id: //poco/Main/Net/include/Poco/Net/NetworkInterface.h#2 $ // // Library: Net // Package: Sockets diff --git a/Net/include/Poco/Net/NullPartHandler.h b/Net/include/Poco/Net/NullPartHandler.h index 5e8afc208..700c541ca 100644 --- a/Net/include/Poco/Net/NullPartHandler.h +++ b/Net/include/Poco/Net/NullPartHandler.h @@ -1,7 +1,7 @@ // // NullPartHandler.h // -// $Id: //poco/1.3/Net/include/Poco/Net/NullPartHandler.h#1 $ +// $Id: //poco/Main/Net/include/Poco/Net/NullPartHandler.h#2 $ // // Library: Net // Package: Messages diff --git a/Net/include/Poco/Net/POP3ClientSession.h b/Net/include/Poco/Net/POP3ClientSession.h index 3a8ec6eb0..3c52c89c2 100644 --- a/Net/include/Poco/Net/POP3ClientSession.h +++ b/Net/include/Poco/Net/POP3ClientSession.h @@ -1,7 +1,7 @@ // // POP3ClientSession.h // -// $Id: //poco/1.3/Net/include/Poco/Net/POP3ClientSession.h#1 $ +// $Id: //poco/Main/Net/include/Poco/Net/POP3ClientSession.h#2 $ // // Library: Net // Package: Mail diff --git a/Net/include/Poco/Net/PartHandler.h b/Net/include/Poco/Net/PartHandler.h index d0dbbea61..da4a2197d 100644 --- a/Net/include/Poco/Net/PartHandler.h +++ b/Net/include/Poco/Net/PartHandler.h @@ -1,7 +1,7 @@ // // PartHandler.h // -// $Id: //poco/1.3/Net/include/Poco/Net/PartHandler.h#1 $ +// $Id: //poco/Main/Net/include/Poco/Net/PartHandler.h#2 $ // // Library: Net // Package: Messages diff --git a/Net/include/Poco/Net/PartSource.h b/Net/include/Poco/Net/PartSource.h index 7d827ff59..138cd762b 100644 --- a/Net/include/Poco/Net/PartSource.h +++ b/Net/include/Poco/Net/PartSource.h @@ -1,7 +1,7 @@ // // PartSource.h // -// $Id: //poco/1.3/Net/include/Poco/Net/PartSource.h#1 $ +// $Id: //poco/Main/Net/include/Poco/Net/PartSource.h#2 $ // // Library: Net // Package: Messages diff --git a/Net/include/Poco/Net/QuotedPrintableDecoder.h b/Net/include/Poco/Net/QuotedPrintableDecoder.h index ebdba5ddd..a08208c69 100644 --- a/Net/include/Poco/Net/QuotedPrintableDecoder.h +++ b/Net/include/Poco/Net/QuotedPrintableDecoder.h @@ -1,7 +1,7 @@ // // QuotedPrintableDecoder.h // -// $Id: //poco/1.3/Net/include/Poco/Net/QuotedPrintableDecoder.h#1 $ +// $Id: //poco/Main/Net/include/Poco/Net/QuotedPrintableDecoder.h#2 $ // // Library: Net // Package: Messages diff --git a/Net/include/Poco/Net/QuotedPrintableEncoder.h b/Net/include/Poco/Net/QuotedPrintableEncoder.h index 61888ead1..5c17ac6e1 100644 --- a/Net/include/Poco/Net/QuotedPrintableEncoder.h +++ b/Net/include/Poco/Net/QuotedPrintableEncoder.h @@ -1,7 +1,7 @@ // // QuotedPrintableEncoder.h // -// $Id: //poco/1.3/Net/include/Poco/Net/QuotedPrintableEncoder.h#1 $ +// $Id: //poco/Main/Net/include/Poco/Net/QuotedPrintableEncoder.h#2 $ // // Library: Net // Package: Messages diff --git a/Net/include/Poco/Net/RawSocket.h b/Net/include/Poco/Net/RawSocket.h index c1b18b19e..fb04cb0b5 100644 --- a/Net/include/Poco/Net/RawSocket.h +++ b/Net/include/Poco/Net/RawSocket.h @@ -1,7 +1,7 @@ // // RawSocket.h // -// $Id: //poco/1.3/Net/include/Poco/Net/RawSocket.h#1 $ +// $Id: //poco/Main/Net/include/Poco/Net/RawSocket.h#2 $ // // Library: Net // Package: Sockets diff --git a/Net/include/Poco/Net/RawSocketImpl.h b/Net/include/Poco/Net/RawSocketImpl.h index a55057895..c90ef7994 100644 --- a/Net/include/Poco/Net/RawSocketImpl.h +++ b/Net/include/Poco/Net/RawSocketImpl.h @@ -1,7 +1,7 @@ // // RawSocketImpl.h // -// $Id: //poco/1.3/Net/include/Poco/Net/RawSocketImpl.h#1 $ +// $Id: //poco/Main/Net/include/Poco/Net/RawSocketImpl.h#2 $ // // Library: Net // Package: Sockets diff --git a/Net/include/Poco/Net/RemoteSyslogChannel.h b/Net/include/Poco/Net/RemoteSyslogChannel.h index d16f5ca75..106a35a69 100644 --- a/Net/include/Poco/Net/RemoteSyslogChannel.h +++ b/Net/include/Poco/Net/RemoteSyslogChannel.h @@ -1,7 +1,7 @@ // // RemoteSyslogChannel.h // -// $Id: //poco/1.3/Net/include/Poco/Net/RemoteSyslogChannel.h#1 $ +// $Id: //poco/Main/Net/include/Poco/Net/RemoteSyslogChannel.h#2 $ // // Library: Net // Package: Logging diff --git a/Net/include/Poco/Net/SMTPClientSession.h b/Net/include/Poco/Net/SMTPClientSession.h index 71313c880..8468fe4de 100644 --- a/Net/include/Poco/Net/SMTPClientSession.h +++ b/Net/include/Poco/Net/SMTPClientSession.h @@ -1,7 +1,7 @@ // // SMTPClientSession.h // -// $Id: //poco/1.3/Net/include/Poco/Net/SMTPClientSession.h#2 $ +// $Id: //poco/Main/Net/include/Poco/Net/SMTPClientSession.h#3 $ // // Library: Net // Package: Mail diff --git a/Net/include/Poco/Net/ServerSocket.h b/Net/include/Poco/Net/ServerSocket.h index 48450fb12..c02a6ec99 100644 --- a/Net/include/Poco/Net/ServerSocket.h +++ b/Net/include/Poco/Net/ServerSocket.h @@ -1,7 +1,7 @@ // // ServerSocket.h // -// $Id: //poco/1.3/Net/include/Poco/Net/ServerSocket.h#1 $ +// $Id: //poco/Main/Net/include/Poco/Net/ServerSocket.h#2 $ // // Library: Net // Package: Sockets diff --git a/Net/include/Poco/Net/ServerSocketImpl.h b/Net/include/Poco/Net/ServerSocketImpl.h index a8ee54610..8bba9bf26 100644 --- a/Net/include/Poco/Net/ServerSocketImpl.h +++ b/Net/include/Poco/Net/ServerSocketImpl.h @@ -1,7 +1,7 @@ // // ServerSocketImpl.h // -// $Id: //poco/1.3/Net/include/Poco/Net/ServerSocketImpl.h#1 $ +// $Id: //poco/Main/Net/include/Poco/Net/ServerSocketImpl.h#2 $ // // Library: Net // Package: Sockets diff --git a/Net/include/Poco/Net/Socket.h b/Net/include/Poco/Net/Socket.h index 5360f758e..cedffecb2 100644 --- a/Net/include/Poco/Net/Socket.h +++ b/Net/include/Poco/Net/Socket.h @@ -1,7 +1,7 @@ // // Socket.h // -// $Id: //poco/1.3/Net/include/Poco/Net/Socket.h#1 $ +// $Id: //poco/Main/Net/include/Poco/Net/Socket.h#2 $ // // Library: Net // Package: Sockets diff --git a/Net/include/Poco/Net/SocketAcceptor.h b/Net/include/Poco/Net/SocketAcceptor.h index ad1a2cac1..5f9b2f353 100644 --- a/Net/include/Poco/Net/SocketAcceptor.h +++ b/Net/include/Poco/Net/SocketAcceptor.h @@ -1,7 +1,7 @@ // // SocketAcceptor.h // -// $Id: //poco/1.3/Net/include/Poco/Net/SocketAcceptor.h#1 $ +// $Id: //poco/Main/Net/include/Poco/Net/SocketAcceptor.h#2 $ // // Library: Net // Package: Reactor diff --git a/Net/include/Poco/Net/SocketAddress.h b/Net/include/Poco/Net/SocketAddress.h index f7b69d72a..348c50175 100644 --- a/Net/include/Poco/Net/SocketAddress.h +++ b/Net/include/Poco/Net/SocketAddress.h @@ -1,7 +1,7 @@ // // SocketAddress.h // -// $Id: //poco/1.3/Net/include/Poco/Net/SocketAddress.h#1 $ +// $Id: //poco/Main/Net/include/Poco/Net/SocketAddress.h#2 $ // // Library: Net // Package: NetCore diff --git a/Net/include/Poco/Net/SocketConnector.h b/Net/include/Poco/Net/SocketConnector.h index 2d0eca5e5..3bed74224 100644 --- a/Net/include/Poco/Net/SocketConnector.h +++ b/Net/include/Poco/Net/SocketConnector.h @@ -1,7 +1,7 @@ // // SocketConnector.h // -// $Id: //poco/1.3/Net/include/Poco/Net/SocketConnector.h#1 $ +// $Id: //poco/Main/Net/include/Poco/Net/SocketConnector.h#2 $ // // Library: Net // Package: Reactor diff --git a/Net/include/Poco/Net/SocketDefs.h b/Net/include/Poco/Net/SocketDefs.h index b48257714..36f9806bd 100644 --- a/Net/include/Poco/Net/SocketDefs.h +++ b/Net/include/Poco/Net/SocketDefs.h @@ -1,7 +1,7 @@ // // SocketDefs.h // -// $Id: //poco/1.3/Net/include/Poco/Net/SocketDefs.h#1 $ +// $Id: //poco/Main/Net/include/Poco/Net/SocketDefs.h#2 $ // // Library: Net // Package: NetCore diff --git a/Net/include/Poco/Net/SocketImpl.h b/Net/include/Poco/Net/SocketImpl.h index 2e9e4a13e..1a6c18bfc 100644 --- a/Net/include/Poco/Net/SocketImpl.h +++ b/Net/include/Poco/Net/SocketImpl.h @@ -1,7 +1,7 @@ // // SocketImpl.h // -// $Id: //poco/1.3/Net/include/Poco/Net/SocketImpl.h#1 $ +// $Id: //poco/Main/Net/include/Poco/Net/SocketImpl.h#2 $ // // Library: Net // Package: Sockets diff --git a/Net/include/Poco/Net/SocketNotification.h b/Net/include/Poco/Net/SocketNotification.h index d4d7f68a0..d9ee98eb2 100644 --- a/Net/include/Poco/Net/SocketNotification.h +++ b/Net/include/Poco/Net/SocketNotification.h @@ -1,7 +1,7 @@ // // SocketNotification.h // -// $Id: //poco/1.3/Net/include/Poco/Net/SocketNotification.h#1 $ +// $Id: //poco/Main/Net/include/Poco/Net/SocketNotification.h#2 $ // // Library: Net // Package: Reactor diff --git a/Net/include/Poco/Net/SocketNotifier.h b/Net/include/Poco/Net/SocketNotifier.h index abb90c06f..1916847f4 100644 --- a/Net/include/Poco/Net/SocketNotifier.h +++ b/Net/include/Poco/Net/SocketNotifier.h @@ -1,7 +1,7 @@ // // SocketNotifier.h // -// $Id: //poco/1.3/Net/include/Poco/Net/SocketNotifier.h#1 $ +// $Id: //poco/Main/Net/include/Poco/Net/SocketNotifier.h#2 $ // // Library: Net // Package: Reactor diff --git a/Net/include/Poco/Net/SocketReactor.h b/Net/include/Poco/Net/SocketReactor.h index 03571a675..216a964b7 100644 --- a/Net/include/Poco/Net/SocketReactor.h +++ b/Net/include/Poco/Net/SocketReactor.h @@ -1,7 +1,7 @@ // // SocketReactor.h // -// $Id: //poco/1.3/Net/include/Poco/Net/SocketReactor.h#1 $ +// $Id: //poco/Main/Net/include/Poco/Net/SocketReactor.h#3 $ // // Library: Net // Package: Reactor diff --git a/Net/include/Poco/Net/SocketStream.h b/Net/include/Poco/Net/SocketStream.h index b023cc8c6..7ad0f7143 100644 --- a/Net/include/Poco/Net/SocketStream.h +++ b/Net/include/Poco/Net/SocketStream.h @@ -1,7 +1,7 @@ // // SocketStream.h // -// $Id: //poco/1.3/Net/include/Poco/Net/SocketStream.h#1 $ +// $Id: //poco/Main/Net/include/Poco/Net/SocketStream.h#2 $ // // Library: Net // Package: Sockets diff --git a/Net/include/Poco/Net/StreamSocket.h b/Net/include/Poco/Net/StreamSocket.h index 97ef68a5b..2eb30a269 100644 --- a/Net/include/Poco/Net/StreamSocket.h +++ b/Net/include/Poco/Net/StreamSocket.h @@ -1,7 +1,7 @@ // // StreamSocket.h // -// $Id: //poco/1.3/Net/include/Poco/Net/StreamSocket.h#1 $ +// $Id: //poco/Main/Net/include/Poco/Net/StreamSocket.h#2 $ // // Library: Net // Package: Sockets diff --git a/Net/include/Poco/Net/StreamSocketImpl.h b/Net/include/Poco/Net/StreamSocketImpl.h index 9810de98f..8c4754fbd 100644 --- a/Net/include/Poco/Net/StreamSocketImpl.h +++ b/Net/include/Poco/Net/StreamSocketImpl.h @@ -1,7 +1,7 @@ // // StreamSocketImpl.h // -// $Id: //poco/1.3/Net/include/Poco/Net/StreamSocketImpl.h#1 $ +// $Id: //poco/Main/Net/include/Poco/Net/StreamSocketImpl.h#2 $ // // Library: Net // Package: Sockets diff --git a/Net/include/Poco/Net/StringPartSource.h b/Net/include/Poco/Net/StringPartSource.h index 9a9d6bcab..4963a23ce 100644 --- a/Net/include/Poco/Net/StringPartSource.h +++ b/Net/include/Poco/Net/StringPartSource.h @@ -1,7 +1,7 @@ // // StringPartSource.h // -// $Id: //poco/1.3/Net/include/Poco/Net/StringPartSource.h#1 $ +// $Id: //poco/Main/Net/include/Poco/Net/StringPartSource.h#2 $ // // Library: Net // Package: Messages diff --git a/Net/include/Poco/Net/TCPServer.h b/Net/include/Poco/Net/TCPServer.h index 805cc8f57..0f604b9f9 100644 --- a/Net/include/Poco/Net/TCPServer.h +++ b/Net/include/Poco/Net/TCPServer.h @@ -1,7 +1,7 @@ // // TCPServer.h // -// $Id: //poco/1.3/Net/include/Poco/Net/TCPServer.h#2 $ +// $Id: //poco/Main/Net/include/Poco/Net/TCPServer.h#3 $ // // Library: Net // Package: TCPServer diff --git a/Net/include/Poco/Net/TCPServerConnection.h b/Net/include/Poco/Net/TCPServerConnection.h index ec8e622b2..e09be745f 100644 --- a/Net/include/Poco/Net/TCPServerConnection.h +++ b/Net/include/Poco/Net/TCPServerConnection.h @@ -1,7 +1,7 @@ // // TCPServerConnection.h // -// $Id: //poco/1.3/Net/include/Poco/Net/TCPServerConnection.h#1 $ +// $Id: //poco/Main/Net/include/Poco/Net/TCPServerConnection.h#2 $ // // Library: Net // Package: TCPServer diff --git a/Net/include/Poco/Net/TCPServerConnectionFactory.h b/Net/include/Poco/Net/TCPServerConnectionFactory.h index c00bb32f2..598d628d6 100644 --- a/Net/include/Poco/Net/TCPServerConnectionFactory.h +++ b/Net/include/Poco/Net/TCPServerConnectionFactory.h @@ -1,7 +1,7 @@ // // TCPServerConnectionFactory.h // -// $Id: //poco/1.3/Net/include/Poco/Net/TCPServerConnectionFactory.h#1 $ +// $Id: //poco/Main/Net/include/Poco/Net/TCPServerConnectionFactory.h#2 $ // // Library: Net // Package: TCPServer diff --git a/Net/include/Poco/Net/TCPServerDispatcher.h b/Net/include/Poco/Net/TCPServerDispatcher.h index 047383481..441676827 100644 --- a/Net/include/Poco/Net/TCPServerDispatcher.h +++ b/Net/include/Poco/Net/TCPServerDispatcher.h @@ -1,7 +1,7 @@ // // TCPServerDispatcher.h // -// $Id: //poco/1.3/Net/include/Poco/Net/TCPServerDispatcher.h#1 $ +// $Id: //poco/Main/Net/include/Poco/Net/TCPServerDispatcher.h#2 $ // // Library: Net // Package: TCPServer diff --git a/Net/include/Poco/Net/TCPServerParams.h b/Net/include/Poco/Net/TCPServerParams.h index 168b1f386..605090e5f 100644 --- a/Net/include/Poco/Net/TCPServerParams.h +++ b/Net/include/Poco/Net/TCPServerParams.h @@ -1,7 +1,7 @@ // // TCPServerParams.h // -// $Id: //poco/1.3/Net/include/Poco/Net/TCPServerParams.h#1 $ +// $Id: //poco/Main/Net/include/Poco/Net/TCPServerParams.h#2 $ // // Library: Net // Package: TCPServer diff --git a/Net/samples/EchoServer/EchoServer.vmsbuild b/Net/samples/EchoServer/EchoServer.vmsbuild index 5065341d5..97db94bbc 100644 --- a/Net/samples/EchoServer/EchoServer.vmsbuild +++ b/Net/samples/EchoServer/EchoServer.vmsbuild @@ -1,7 +1,7 @@ # # sample.vmsbuild # -# $Id: //poco/1.3/Net/samples/EchoServer/EchoServer.vmsbuild#1 $ +# $Id: //poco/Main/Net/samples/EchoServer/EchoServer.vmsbuild#1 $ # EXE=EchoServer EchoServer diff --git a/Net/samples/EchoServer/Makefile b/Net/samples/EchoServer/Makefile index 868051512..a6cf04f0b 100644 --- a/Net/samples/EchoServer/Makefile +++ b/Net/samples/EchoServer/Makefile @@ -1,7 +1,7 @@ # # Makefile # -# $Id: //poco/1.3/Net/samples/EchoServer/Makefile#1 $ +# $Id: //poco/Main/Net/samples/EchoServer/Makefile#2 $ # # Makefile for Poco EchoServer # diff --git a/Net/samples/EchoServer/src/EchoServer.cpp b/Net/samples/EchoServer/src/EchoServer.cpp index 36ba907ef..dbe59b9e1 100644 --- a/Net/samples/EchoServer/src/EchoServer.cpp +++ b/Net/samples/EchoServer/src/EchoServer.cpp @@ -1,7 +1,7 @@ // // EchoServer.cpp // -// $Id: //poco/1.3/Net/samples/EchoServer/src/EchoServer.cpp#1 $ +// $Id: //poco/Main/Net/samples/EchoServer/src/EchoServer.cpp#7 $ // // This sample demonstrates the SocketReactor and SocketAcceptor classes. // diff --git a/Net/samples/HTTPFormServer/HTTPFormServer.vmsbuild b/Net/samples/HTTPFormServer/HTTPFormServer.vmsbuild index 0ddd6dbe4..6584f4be2 100644 --- a/Net/samples/HTTPFormServer/HTTPFormServer.vmsbuild +++ b/Net/samples/HTTPFormServer/HTTPFormServer.vmsbuild @@ -1,7 +1,7 @@ # # sample.vmsbuild # -# $Id: //poco/1.3/Net/samples/HTTPFormServer/HTTPFormServer.vmsbuild#1 $ +# $Id: //poco/Main/Net/samples/HTTPFormServer/HTTPFormServer.vmsbuild#1 $ # EXE=HTTPFormServer HTTPFormServer diff --git a/Net/samples/HTTPFormServer/Makefile b/Net/samples/HTTPFormServer/Makefile index 1baf4eeab..94bd58993 100644 --- a/Net/samples/HTTPFormServer/Makefile +++ b/Net/samples/HTTPFormServer/Makefile @@ -1,7 +1,7 @@ # # Makefile # -# $Id: //poco/1.3/Net/samples/HTTPFormServer/Makefile#1 $ +# $Id: //poco/Main/Net/samples/HTTPFormServer/Makefile#1 $ # # Makefile for Poco HTTPFormServer # diff --git a/Net/samples/HTTPLoadTest/HTTPLoadTest.vmsbuild b/Net/samples/HTTPLoadTest/HTTPLoadTest.vmsbuild index 2f52dd9b4..e39988ee3 100644 --- a/Net/samples/HTTPLoadTest/HTTPLoadTest.vmsbuild +++ b/Net/samples/HTTPLoadTest/HTTPLoadTest.vmsbuild @@ -1,7 +1,7 @@ # # HTTPLoadTest.vmsbuild # -# $Id: //poco/1.3/Net/samples/HTTPLoadTest/HTTPLoadTest.vmsbuild#1 $ +# $Id: //poco/Main/Net/samples/HTTPLoadTest/HTTPLoadTest.vmsbuild#1 $ # EXE=HTTPLoadTest HTTPLoadTest diff --git a/Net/samples/HTTPLoadTest/Makefile b/Net/samples/HTTPLoadTest/Makefile index b6526083d..786af660f 100644 --- a/Net/samples/HTTPLoadTest/Makefile +++ b/Net/samples/HTTPLoadTest/Makefile @@ -1,7 +1,7 @@ # # Makefile # -# $Id: //poco/1.3/Net/samples/HTTPLoadTest/Makefile#1 $ +# $Id: //poco/Main/Net/samples/HTTPLoadTest/Makefile#1 $ # # Makefile for Poco HTTPLoadTest # diff --git a/Net/samples/HTTPLoadTest/src/HTTPLoadTest.cpp b/Net/samples/HTTPLoadTest/src/HTTPLoadTest.cpp index c3288030a..7db22a3b0 100644 --- a/Net/samples/HTTPLoadTest/src/HTTPLoadTest.cpp +++ b/Net/samples/HTTPLoadTest/src/HTTPLoadTest.cpp @@ -1,7 +1,7 @@ // // HTTPLoadTest.cpp // -// $Id: //poco/1.3/Net/samples/HTTPLoadTest/src/HTTPLoadTest.cpp#1 $ +// $Id: //poco/Main/Net/samples/HTTPLoadTest/src/HTTPLoadTest.cpp#5 $ // // This sample demonstrates the HTTPClientSession class. // diff --git a/Net/samples/HTTPTimeServer/HTTPTimeServer.vmsbuild b/Net/samples/HTTPTimeServer/HTTPTimeServer.vmsbuild index 61be67113..7f31e6546 100644 --- a/Net/samples/HTTPTimeServer/HTTPTimeServer.vmsbuild +++ b/Net/samples/HTTPTimeServer/HTTPTimeServer.vmsbuild @@ -1,7 +1,7 @@ # # sample.vmsbuild # -# $Id: //poco/1.3/Net/samples/HTTPTimeServer/HTTPTimeServer.vmsbuild#1 $ +# $Id: //poco/Main/Net/samples/HTTPTimeServer/HTTPTimeServer.vmsbuild#1 $ # EXE=HTTPTimeServer HTTPTimeServer diff --git a/Net/samples/HTTPTimeServer/Makefile b/Net/samples/HTTPTimeServer/Makefile index 02431263a..0883b560b 100644 --- a/Net/samples/HTTPTimeServer/Makefile +++ b/Net/samples/HTTPTimeServer/Makefile @@ -1,7 +1,7 @@ # # Makefile # -# $Id: //poco/1.3/Net/samples/HTTPTimeServer/Makefile#1 $ +# $Id: //poco/Main/Net/samples/HTTPTimeServer/Makefile#2 $ # # Makefile for Poco HTTPTimeServer # diff --git a/Net/samples/HTTPTimeServer/src/HTTPTimeServer.cpp b/Net/samples/HTTPTimeServer/src/HTTPTimeServer.cpp index 4a4115ff9..362446e7e 100644 --- a/Net/samples/HTTPTimeServer/src/HTTPTimeServer.cpp +++ b/Net/samples/HTTPTimeServer/src/HTTPTimeServer.cpp @@ -1,7 +1,7 @@ // // HTTPTimeServer.cpp // -// $Id: //poco/1.3/Net/samples/HTTPTimeServer/src/HTTPTimeServer.cpp#1 $ +// $Id: //poco/Main/Net/samples/HTTPTimeServer/src/HTTPTimeServer.cpp#10 $ // // This sample demonstrates the HTTPServer and related classes. // diff --git a/Net/samples/Mail/Mail.vmsbuild b/Net/samples/Mail/Mail.vmsbuild index 4fa4d73ed..8ee89f4d8 100644 --- a/Net/samples/Mail/Mail.vmsbuild +++ b/Net/samples/Mail/Mail.vmsbuild @@ -1,7 +1,7 @@ # # sample.vmsbuild # -# $Id: //poco/1.3/Net/samples/Mail/Mail.vmsbuild#1 $ +# $Id: //poco/Main/Net/samples/Mail/Mail.vmsbuild#1 $ # EXE=Mail Mail diff --git a/Net/samples/Mail/Makefile b/Net/samples/Mail/Makefile index df0424c95..38c285646 100644 --- a/Net/samples/Mail/Makefile +++ b/Net/samples/Mail/Makefile @@ -1,7 +1,7 @@ # # Makefile # -# $Id: //poco/1.3/Net/samples/Mail/Makefile#1 $ +# $Id: //poco/Main/Net/samples/Mail/Makefile#2 $ # # Makefile for Poco Mail # diff --git a/Net/samples/Mail/src/Mail.cpp b/Net/samples/Mail/src/Mail.cpp index 6c216beda..7352d5d3c 100644 --- a/Net/samples/Mail/src/Mail.cpp +++ b/Net/samples/Mail/src/Mail.cpp @@ -1,7 +1,7 @@ // // Mail.cpp // -// $Id: //poco/1.3/Net/samples/Mail/src/Mail.cpp#1 $ +// $Id: //poco/Main/Net/samples/Mail/src/Mail.cpp#6 $ // // This sample demonstrates the MailMessage and SMTPClientSession classes. // diff --git a/Net/samples/Makefile b/Net/samples/Makefile index e8309bd0a..0a453a500 100644 --- a/Net/samples/Makefile +++ b/Net/samples/Makefile @@ -1,7 +1,7 @@ # # Makefile # -# $Id: //poco/1.3/Net/samples/Makefile#1 $ +# $Id: //poco/Main/Net/samples/Makefile#8 $ # # Makefile for Poco Net Samples # diff --git a/Net/samples/Ping/Makefile b/Net/samples/Ping/Makefile index 425cd056d..2f46c944f 100644 --- a/Net/samples/Ping/Makefile +++ b/Net/samples/Ping/Makefile @@ -1,7 +1,7 @@ # # Makefile # -# $Id: //poco/1.3/Net/samples/Ping/Makefile#1 $ +# $Id: //poco/Main/Net/samples/Ping/Makefile#2 $ # # Makefile for Poco ping # diff --git a/Net/samples/Ping/Ping.vmsbuild b/Net/samples/Ping/Ping.vmsbuild index 5a1ec621f..1de55a7b9 100644 --- a/Net/samples/Ping/Ping.vmsbuild +++ b/Net/samples/Ping/Ping.vmsbuild @@ -1,7 +1,7 @@ # # sample.vmsbuild # -# $Id: //poco/1.3/Net/samples/Ping/Ping.vmsbuild#1 $ +# $Id: //poco/Main/Net/samples/Ping/Ping.vmsbuild#1 $ # EXE=Ping Ping diff --git a/Net/samples/Ping/src/Ping.cpp b/Net/samples/Ping/src/Ping.cpp index 62c9cfb6b..320c9e8f6 100644 --- a/Net/samples/Ping/src/Ping.cpp +++ b/Net/samples/Ping/src/Ping.cpp @@ -1,7 +1,7 @@ // // Ping.cpp // -// $Id: //poco/1.3/Net/samples/Ping/src/Ping.cpp#1 $ +// $Id: //poco/Main/Net/samples/Ping/src/Ping.cpp#6 $ // // This sample demonstrates the Application class. // diff --git a/Net/samples/TimeServer/Makefile b/Net/samples/TimeServer/Makefile index 5382e718a..baf2fbf89 100644 --- a/Net/samples/TimeServer/Makefile +++ b/Net/samples/TimeServer/Makefile @@ -1,7 +1,7 @@ # # Makefile # -# $Id: //poco/1.3/Net/samples/TimeServer/Makefile#1 $ +# $Id: //poco/Main/Net/samples/TimeServer/Makefile#2 $ # # Makefile for Poco TimeServer # diff --git a/Net/samples/TimeServer/TimeServer.vmsbuild b/Net/samples/TimeServer/TimeServer.vmsbuild index 3a6550d4f..e3cad41a4 100644 --- a/Net/samples/TimeServer/TimeServer.vmsbuild +++ b/Net/samples/TimeServer/TimeServer.vmsbuild @@ -1,7 +1,7 @@ # # sample.vmsbuild # -# $Id: //poco/1.3/Net/samples/TimeServer/TimeServer.vmsbuild#1 $ +# $Id: //poco/Main/Net/samples/TimeServer/TimeServer.vmsbuild#1 $ # EXE=TimeServer TimeServer diff --git a/Net/samples/TimeServer/src/TimeServer.cpp b/Net/samples/TimeServer/src/TimeServer.cpp index d6898c19f..d634b7499 100644 --- a/Net/samples/TimeServer/src/TimeServer.cpp +++ b/Net/samples/TimeServer/src/TimeServer.cpp @@ -1,7 +1,7 @@ // // TimeServer.cpp // -// $Id: //poco/1.3/Net/samples/TimeServer/src/TimeServer.cpp#1 $ +// $Id: //poco/Main/Net/samples/TimeServer/src/TimeServer.cpp#7 $ // // This sample demonstrates the TCPServer and ServerSocket classes. // diff --git a/Net/samples/dict/Makefile b/Net/samples/dict/Makefile index a552dd490..79ef6b72b 100644 --- a/Net/samples/dict/Makefile +++ b/Net/samples/dict/Makefile @@ -1,7 +1,7 @@ # # Makefile # -# $Id: //poco/1.3/Net/samples/dict/Makefile#1 $ +# $Id: //poco/Main/Net/samples/dict/Makefile#2 $ # # Makefile for Poco dict # diff --git a/Net/samples/dict/dict.vmsbuild b/Net/samples/dict/dict.vmsbuild index f9a58889a..8c5a7fe8c 100644 --- a/Net/samples/dict/dict.vmsbuild +++ b/Net/samples/dict/dict.vmsbuild @@ -1,7 +1,7 @@ # # sample.vmsbuild # -# $Id: //poco/1.3/Net/samples/dict/dict.vmsbuild#1 $ +# $Id: //poco/Main/Net/samples/dict/dict.vmsbuild#1 $ # EXE=dict dict diff --git a/Net/samples/dict/src/dict.cpp b/Net/samples/dict/src/dict.cpp index 2de9901ae..3d1956183 100644 --- a/Net/samples/dict/src/dict.cpp +++ b/Net/samples/dict/src/dict.cpp @@ -1,7 +1,7 @@ // // dict.cpp // -// $Id: //poco/1.3/Net/samples/dict/src/dict.cpp#2 $ +// $Id: //poco/Main/Net/samples/dict/src/dict.cpp#6 $ // // This sample demonstrates the StreamSocket and SocketStream classes. // diff --git a/Net/samples/download/src/download.cpp b/Net/samples/download/src/download.cpp index ba43fc505..41430bfa4 100644 --- a/Net/samples/download/src/download.cpp +++ b/Net/samples/download/src/download.cpp @@ -1,7 +1,7 @@ // // download.cpp // -// $Id: //poco/1.3/Net/samples/download/src/download.cpp#1 $ +// $Id: //poco/Main/Net/samples/download/src/download.cpp#5 $ // // This sample demonstrates the URIStreamOpener class. // diff --git a/Net/samples/httpget/Makefile b/Net/samples/httpget/Makefile index 66976a872..5ddf31300 100644 --- a/Net/samples/httpget/Makefile +++ b/Net/samples/httpget/Makefile @@ -1,7 +1,7 @@ # # Makefile # -# $Id: //poco/1.3/Net/samples/httpget/Makefile#1 $ +# $Id: //poco/Main/Net/samples/httpget/Makefile#2 $ # # Makefile for Poco httpget # diff --git a/Net/samples/httpget/httpget.vmsbuild b/Net/samples/httpget/httpget.vmsbuild index e8d7ad173..5551d669b 100644 --- a/Net/samples/httpget/httpget.vmsbuild +++ b/Net/samples/httpget/httpget.vmsbuild @@ -1,7 +1,7 @@ # # sample.vmsbuild # -# $Id: //poco/1.3/Net/samples/httpget/httpget.vmsbuild#1 $ +# $Id: //poco/Main/Net/samples/httpget/httpget.vmsbuild#1 $ # EXE=httpget httpget diff --git a/Net/samples/httpget/src/httpget.cpp b/Net/samples/httpget/src/httpget.cpp index e8d994132..17fd22371 100644 --- a/Net/samples/httpget/src/httpget.cpp +++ b/Net/samples/httpget/src/httpget.cpp @@ -1,7 +1,7 @@ // // httpget.cpp // -// $Id: //poco/1.3/Net/samples/httpget/src/httpget.cpp#1 $ +// $Id: //poco/Main/Net/samples/httpget/src/httpget.cpp#5 $ // // This sample demonstrates the HTTPClientSession class. // diff --git a/Net/src/DNS.cpp b/Net/src/DNS.cpp index 73803281a..7fe201c6b 100644 --- a/Net/src/DNS.cpp +++ b/Net/src/DNS.cpp @@ -1,7 +1,7 @@ // // DNS.cpp // -// $Id: //poco/1.3/Net/src/DNS.cpp#1 $ +// $Id: //poco/Main/Net/src/DNS.cpp#8 $ // // Library: Net // Package: NetCore diff --git a/Net/src/DatagramSocket.cpp b/Net/src/DatagramSocket.cpp index f202e92e4..5bdb5520e 100644 --- a/Net/src/DatagramSocket.cpp +++ b/Net/src/DatagramSocket.cpp @@ -1,7 +1,7 @@ // // DatagramSocket.cpp // -// $Id: //poco/1.3/Net/src/DatagramSocket.cpp#1 $ +// $Id: //poco/Main/Net/src/DatagramSocket.cpp#6 $ // // Library: Net // Package: Sockets diff --git a/Net/src/DatagramSocketImpl.cpp b/Net/src/DatagramSocketImpl.cpp index 4b15aab9e..16507867e 100644 --- a/Net/src/DatagramSocketImpl.cpp +++ b/Net/src/DatagramSocketImpl.cpp @@ -1,7 +1,7 @@ // // DatagramSocketImpl.cpp // -// $Id: //poco/1.3/Net/src/DatagramSocketImpl.cpp#1 $ +// $Id: //poco/Main/Net/src/DatagramSocketImpl.cpp#6 $ // // Library: Net // Package: Sockets diff --git a/Net/src/DialogSocket.cpp b/Net/src/DialogSocket.cpp index 39f4dbb08..d90c49142 100644 --- a/Net/src/DialogSocket.cpp +++ b/Net/src/DialogSocket.cpp @@ -1,7 +1,7 @@ // // DialogSocket.cpp // -// $Id: //poco/1.3/Net/src/DialogSocket.cpp#1 $ +// $Id: //poco/Main/Net/src/DialogSocket.cpp#9 $ // // Library: Net // Package: Sockets @@ -172,7 +172,7 @@ int DialogSocket::get() { refill(); if (_pNext != _pEnd) - return *_pNext++; + return std::char_traits::to_int_type(*_pNext++); else return EOF_CHAR; } @@ -182,7 +182,7 @@ int DialogSocket::peek() { refill(); if (_pNext != _pEnd) - return *_pNext; + return std::char_traits::to_int_type(*_pNext); else return EOF_CHAR; } diff --git a/Net/src/FTPClientSession.cpp b/Net/src/FTPClientSession.cpp index c1ad391be..b4a0961e3 100644 --- a/Net/src/FTPClientSession.cpp +++ b/Net/src/FTPClientSession.cpp @@ -1,7 +1,7 @@ // // FTPClientSession.cpp // -// $Id: //poco/1.3/Net/src/FTPClientSession.cpp#1 $ +// $Id: //poco/Main/Net/src/FTPClientSession.cpp#7 $ // // Library: Net // Package: FTP diff --git a/Net/src/FTPStreamFactory.cpp b/Net/src/FTPStreamFactory.cpp index 7f2201699..a34727839 100644 --- a/Net/src/FTPStreamFactory.cpp +++ b/Net/src/FTPStreamFactory.cpp @@ -1,7 +1,7 @@ // // FTPStreamFactory.cpp // -// $Id: //poco/1.3/Net/src/FTPStreamFactory.cpp#1 $ +// $Id: //poco/Main/Net/src/FTPStreamFactory.cpp#6 $ // // Library: Net // Package: FTP diff --git a/Net/src/FilePartSource.cpp b/Net/src/FilePartSource.cpp index aee8033c7..a980a3e68 100644 --- a/Net/src/FilePartSource.cpp +++ b/Net/src/FilePartSource.cpp @@ -1,7 +1,7 @@ // // FilePartSource.cpp // -// $Id: //poco/1.3/Net/src/FilePartSource.cpp#1 $ +// $Id: //poco/Main/Net/src/FilePartSource.cpp#7 $ // // Library: Net // Package: Messages diff --git a/Net/src/HTMLForm.cpp b/Net/src/HTMLForm.cpp index 00e1dd3e9..ce95968b0 100644 --- a/Net/src/HTMLForm.cpp +++ b/Net/src/HTMLForm.cpp @@ -1,7 +1,7 @@ // // HTMLForm.cpp // -// $Id: //poco/1.3/Net/src/HTMLForm.cpp#1 $ +// $Id: //poco/Main/Net/src/HTMLForm.cpp#16 $ // // Library: Net // Package: HTML @@ -42,6 +42,7 @@ #include "Poco/Net/MultipartReader.h" #include "Poco/Net/NullPartHandler.h" #include "Poco/NullStream.h" +#include "Poco/CountingStream.h" #include "Poco/StreamCopier.h" #include "Poco/Exception.h" #include "Poco/URI.h" @@ -179,6 +180,10 @@ void HTMLForm::prepareSubmit(HTTPRequest& request) if (_encoding == ENCODING_URL) { request.setContentType(_encoding); + request.setChunkedTransferEncoding(false); + Poco::CountingOutputStream ostr; + writeUrl(ostr); + request.setContentLength(ostr.chars()); } else { @@ -194,7 +199,7 @@ void HTMLForm::prepareSubmit(HTTPRequest& request) request.setKeepAlive(false); request.setChunkedTransferEncoding(false); } - else + else if (_encoding != ENCODING_URL) { request.setChunkedTransferEncoding(true); } @@ -203,7 +208,7 @@ void HTMLForm::prepareSubmit(HTTPRequest& request) { std::string uri = request.getURI(); std::ostringstream ostr; - write(ostr); + writeUrl(ostr); uri.append("?"); uri.append(ostr.str()); request.setURI(uri); diff --git a/Net/src/HTTPBasicCredentials.cpp b/Net/src/HTTPBasicCredentials.cpp index 1e49ea7cd..5441c59ca 100644 --- a/Net/src/HTTPBasicCredentials.cpp +++ b/Net/src/HTTPBasicCredentials.cpp @@ -1,7 +1,7 @@ // // HTTPBasicCredentials.cpp // -// $Id: //poco/1.3/Net/src/HTTPBasicCredentials.cpp#1 $ +// $Id: //poco/Main/Net/src/HTTPBasicCredentials.cpp#5 $ // // Library: Net // Package: HTTP diff --git a/Net/src/HTTPChunkedStream.cpp b/Net/src/HTTPChunkedStream.cpp index 5c4fe3666..6bbad14a6 100644 --- a/Net/src/HTTPChunkedStream.cpp +++ b/Net/src/HTTPChunkedStream.cpp @@ -1,7 +1,7 @@ // // HTTPChunkedStream.cpp // -// $Id: //poco/1.3/Net/src/HTTPChunkedStream.cpp#3 $ +// $Id: //poco/Main/Net/src/HTTPChunkedStream.cpp#12 $ // // Library: Net // Package: HTTP @@ -113,11 +113,11 @@ int HTTPChunkedStreamBuf::readFromDevice(char* buffer, std::streamsize length) int HTTPChunkedStreamBuf::writeToDevice(const char* buffer, std::streamsize length) { - std::string chunkSize(NumberFormatter::formatHex(length)); - chunkSize.append("\r\n"); - _session.write(chunkSize.data(), (std::streamsize) chunkSize.length()); - _session.write(buffer, length); - _session.write("\r\n", 2); + _chunkBuffer = NumberFormatter::formatHex(length); + _chunkBuffer.append("\r\n", 2); + _chunkBuffer.append(buffer, length); + _chunkBuffer.append("\r\n", 2); + _session.write(_chunkBuffer.data(), static_cast(_chunkBuffer.size())); return length; } diff --git a/Net/src/HTTPClientSession.cpp b/Net/src/HTTPClientSession.cpp index 04f661769..8efc2e650 100644 --- a/Net/src/HTTPClientSession.cpp +++ b/Net/src/HTTPClientSession.cpp @@ -1,7 +1,7 @@ // // HTTPClientSession.cpp // -// $Id: //poco/1.3/Net/src/HTTPClientSession.cpp#2 $ +// $Id: //poco/Main/Net/src/HTTPClientSession.cpp#16 $ // // Library: Net // Package: HTTPClient @@ -43,6 +43,7 @@ #include "Poco/Net/HTTPChunkedStream.h" #include "Poco/Net/NetException.h" #include "Poco/NumberFormatter.h" +#include "Poco/CountingStream.h" using Poco::NumberFormatter; @@ -57,6 +58,7 @@ HTTPClientSession::HTTPClientSession(): _port(HTTPSession::HTTP_PORT), _proxyPort(HTTPSession::HTTP_PORT), _reconnect(false), + _mustReconnect(false), _expectResponseBody(false), _pRequestStream(0), _pResponseStream(0) @@ -69,6 +71,7 @@ HTTPClientSession::HTTPClientSession(const StreamSocket& socket): _port(HTTPSession::HTTP_PORT), _proxyPort(HTTPSession::HTTP_PORT), _reconnect(false), + _mustReconnect(false), _expectResponseBody(false), _pRequestStream(0), _pResponseStream(0) @@ -81,6 +84,7 @@ HTTPClientSession::HTTPClientSession(const SocketAddress& address): _port(address.port()), _proxyPort(HTTPSession::HTTP_PORT), _reconnect(false), + _mustReconnect(false), _expectResponseBody(false), _pRequestStream(0), _pResponseStream(0) @@ -93,6 +97,7 @@ HTTPClientSession::HTTPClientSession(const std::string& host, Poco::UInt16 port) _port(port), _proxyPort(HTTPSession::HTTP_PORT), _reconnect(false), + _mustReconnect(false), _expectResponseBody(false), _pRequestStream(0), _pResponseStream(0) @@ -160,8 +165,11 @@ std::ostream& HTTPClientSession::sendRequest(HTTPRequest& request) _pResponseStream = 0; bool keepAlive = getKeepAlive(); - if (connected() && !keepAlive) + if (connected() && !keepAlive || _mustReconnect) + { close(); + _mustReconnect = false; + } if (!connected()) reconnect(); if (!keepAlive) @@ -169,20 +177,33 @@ std::ostream& HTTPClientSession::sendRequest(HTTPRequest& request) request.setHost(_host, _port); if (!_proxyHost.empty()) request.setURI(getHostInfo() + request.getURI()); - HTTPHeaderOutputStream hos(*this); _reconnect = keepAlive; - request.write(hos); - _reconnect = false; _expectResponseBody = request.getMethod() != HTTPRequest::HTTP_HEAD; if (request.getChunkedTransferEncoding()) + { + HTTPHeaderOutputStream hos(*this); + request.write(hos); _pRequestStream = new HTTPChunkedOutputStream(*this); + } else if (request.getContentLength() != HTTPMessage::UNKNOWN_CONTENT_LENGTH) - _pRequestStream = new HTTPFixedLengthOutputStream(*this, request.getContentLength()); + { + Poco::CountingOutputStream cs; + request.write(cs); + _pRequestStream = new HTTPFixedLengthOutputStream(*this, request.getContentLength() + cs.chars()); + request.write(*_pRequestStream); + } else if (request.getMethod() == HTTPRequest::HTTP_GET || request.getMethod() == HTTPRequest::HTTP_HEAD) - _pRequestStream = new HTTPFixedLengthOutputStream(*this, 0); + { + Poco::CountingOutputStream cs; + request.write(cs); + _pRequestStream = new HTTPFixedLengthOutputStream(*this, cs.chars()); + request.write(*_pRequestStream); + } else + { _pRequestStream = new HTTPOutputStream(*this); - + request.write(*_pRequestStream); + } return *_pRequestStream; } @@ -210,6 +231,8 @@ std::istream& HTTPClientSession::receiveResponse(HTTPResponse& response) } while (response.getStatus() == HTTPResponse::HTTP_CONTINUE); + _mustReconnect = getKeepAlive() && !response.getKeepAlive(); + if (!_expectResponseBody) _pResponseStream = new HTTPFixedLengthInputStream(*this, 0); else if (response.getChunkedTransferEncoding()) @@ -239,6 +262,7 @@ int HTTPClientSession::write(const char* buffer, std::streamsize length) } else throw; } + _reconnect = false; } diff --git a/Net/src/HTTPCookie.cpp b/Net/src/HTTPCookie.cpp index b3b873010..920d07e8e 100644 --- a/Net/src/HTTPCookie.cpp +++ b/Net/src/HTTPCookie.cpp @@ -1,7 +1,7 @@ // // HTTPCookie.cpp // -// $Id: //poco/1.3/Net/src/HTTPCookie.cpp#1 $ +// $Id: //poco/Main/Net/src/HTTPCookie.cpp#6 $ // // Library: Net // Package: HTTP @@ -111,7 +111,7 @@ HTTPCookie::HTTPCookie(const NameValueCollection& nvc): int tzd; DateTime exp = DateTimeParser::parse(value, tzd); Timestamp now; - setMaxAge((int) ((exp.timestamp() - now)/1000000)); + setMaxAge((int) ((exp.timestamp() - now)/Timestamp::resolution())); } else if (icompare(name, "version") == 0) { @@ -240,9 +240,9 @@ std::string HTTPCookie::toString() const if (_maxAge >= 0) { Timestamp ts; - ts += _maxAge*1000000; + ts += _maxAge*Timestamp::resolution(); result.append("; expires="); - result.append(DateTimeFormatter::format(ts, DateTimeFormat::RFC850_FORMAT)); + result.append(DateTimeFormatter::format(ts, DateTimeFormat::HTTP_FORMAT)); } if (_secure) { diff --git a/Net/src/HTTPFixedLengthStream.cpp b/Net/src/HTTPFixedLengthStream.cpp index 8feba976c..71c778241 100644 --- a/Net/src/HTTPFixedLengthStream.cpp +++ b/Net/src/HTTPFixedLengthStream.cpp @@ -1,7 +1,7 @@ // // HTTPFixedLengthStream.cpp // -// $Id: //poco/1.3/Net/src/HTTPFixedLengthStream.cpp#1 $ +// $Id: //poco/Main/Net/src/HTTPFixedLengthStream.cpp#9 $ // // Library: Net // Package: HTTP diff --git a/Net/src/HTTPHeaderStream.cpp b/Net/src/HTTPHeaderStream.cpp index 9136ed274..b1c1c8088 100644 --- a/Net/src/HTTPHeaderStream.cpp +++ b/Net/src/HTTPHeaderStream.cpp @@ -1,7 +1,7 @@ // // HTTPHeaderStream.cpp // -// $Id: //poco/1.3/Net/src/HTTPHeaderStream.cpp#1 $ +// $Id: //poco/Main/Net/src/HTTPHeaderStream.cpp#9 $ // // Library: Net // Package: HTTP diff --git a/Net/src/HTTPMessage.cpp b/Net/src/HTTPMessage.cpp index 76526db1d..1e87b6212 100644 --- a/Net/src/HTTPMessage.cpp +++ b/Net/src/HTTPMessage.cpp @@ -1,7 +1,7 @@ // // HTTPMessage.cpp // -// $Id: //poco/1.3/Net/src/HTTPMessage.cpp#1 $ +// $Id: //poco/Main/Net/src/HTTPMessage.cpp#7 $ // // Library: Net // Package: HTTP diff --git a/Net/src/HTTPRequest.cpp b/Net/src/HTTPRequest.cpp index 95a7a04b0..7c18e4965 100644 --- a/Net/src/HTTPRequest.cpp +++ b/Net/src/HTTPRequest.cpp @@ -1,7 +1,7 @@ // // HTTPRequest.cpp // -// $Id: //poco/1.3/Net/src/HTTPRequest.cpp#2 $ +// $Id: //poco/Main/Net/src/HTTPRequest.cpp#10 $ // // Library: Net // Package: HTTP diff --git a/Net/src/HTTPRequestHandler.cpp b/Net/src/HTTPRequestHandler.cpp index 826eea3b2..5315bc691 100644 --- a/Net/src/HTTPRequestHandler.cpp +++ b/Net/src/HTTPRequestHandler.cpp @@ -1,7 +1,7 @@ // // HTTPRequestHandler.cpp // -// $Id: //poco/1.3/Net/src/HTTPRequestHandler.cpp#1 $ +// $Id: //poco/Main/Net/src/HTTPRequestHandler.cpp#6 $ // // Library: Net // Package: HTTPServer diff --git a/Net/src/HTTPRequestHandlerFactory.cpp b/Net/src/HTTPRequestHandlerFactory.cpp index 35f04e899..5350a0a40 100644 --- a/Net/src/HTTPRequestHandlerFactory.cpp +++ b/Net/src/HTTPRequestHandlerFactory.cpp @@ -1,7 +1,7 @@ // // HTTPRequestHandlerFactory.cpp // -// $Id: //poco/1.3/Net/src/HTTPRequestHandlerFactory.cpp#1 $ +// $Id: //poco/Main/Net/src/HTTPRequestHandlerFactory.cpp#6 $ // // Library: Net // Package: HTTPServer diff --git a/Net/src/HTTPResponse.cpp b/Net/src/HTTPResponse.cpp index 8bd43cd11..d07e9d268 100644 --- a/Net/src/HTTPResponse.cpp +++ b/Net/src/HTTPResponse.cpp @@ -1,7 +1,7 @@ // // HTTPResponse.cpp // -// $Id: //poco/1.3/Net/src/HTTPResponse.cpp#1 $ +// $Id: //poco/Main/Net/src/HTTPResponse.cpp#10 $ // // Library: Net // Package: HTTP diff --git a/Net/src/HTTPServer.cpp b/Net/src/HTTPServer.cpp index deb06051d..7db0b76a3 100644 --- a/Net/src/HTTPServer.cpp +++ b/Net/src/HTTPServer.cpp @@ -1,7 +1,7 @@ // // HTTPServer.cpp // -// $Id: //poco/1.3/Net/src/HTTPServer.cpp#1 $ +// $Id: //poco/Main/Net/src/HTTPServer.cpp#6 $ // // Library: Net // Package: HTTPServer diff --git a/Net/src/HTTPServerConnection.cpp b/Net/src/HTTPServerConnection.cpp index 693fc20b2..28291a80d 100644 --- a/Net/src/HTTPServerConnection.cpp +++ b/Net/src/HTTPServerConnection.cpp @@ -1,7 +1,7 @@ // // HTTPServerConnection.cpp // -// $Id: //poco/1.3/Net/src/HTTPServerConnection.cpp#1 $ +// $Id: //poco/Main/Net/src/HTTPServerConnection.cpp#8 $ // // Library: Net // Package: HTTPServer @@ -74,30 +74,51 @@ void HTTPServerConnection::run() HTTPServerSession session(socket(), _pParams); while (session.hasMoreRequests()) { - HTTPServerRequest request(session, _pParams); - HTTPServerResponse response(session); - response.setVersion(request.getVersion()); - response.setKeepAlive(_pParams->getKeepAlive() && request.getKeepAlive()); - if (!server.empty()) - response.set("Server", server); - std::auto_ptr pHandler(_pFactory->createRequestHandler(request)); - if (pHandler.get()) + try { - if (request.expectContinue()) - response.sendContinue(); - - pHandler->handleRequest(request, response); - session.setKeepAlive(_pParams->getKeepAlive() && response.getKeepAlive()); + HTTPServerRequest request(session, _pParams); + HTTPServerResponse response(session); + response.setVersion(request.getVersion()); + response.setKeepAlive(_pParams->getKeepAlive() && request.getKeepAlive() && session.canKeepAlive()); + if (!server.empty()) + response.set("Server", server); + try + { + std::auto_ptr pHandler(_pFactory->createRequestHandler(request)); + if (pHandler.get()) + { + if (request.expectContinue()) + response.sendContinue(); + + pHandler->handleRequest(request, response); + session.setKeepAlive(_pParams->getKeepAlive() && response.getKeepAlive() && session.canKeepAlive()); + } + else sendErrorResponse(session, HTTPResponse::HTTP_NOT_IMPLEMENTED); + } + catch (Poco::Exception&) + { + if (!response.sent()) + sendErrorResponse(session, HTTPResponse::HTTP_INTERNAL_SERVER_ERROR); + throw; + } } - else + catch (MessageException&) { - response.setStatusAndReason(HTTPResponse::HTTP_NOT_IMPLEMENTED); - response.setKeepAlive(false); - response.send(); - session.setKeepAlive(false); + sendErrorResponse(session, HTTPResponse::HTTP_BAD_REQUEST); } } } +void HTTPServerConnection::sendErrorResponse(HTTPServerSession& session, HTTPResponse::HTTPStatus status) +{ + HTTPServerResponse response(session); + response.setVersion(HTTPMessage::HTTP_1_1); + response.setStatusAndReason(status); + response.setKeepAlive(false); + response.send(); + session.setKeepAlive(false); +} + + } } // namespace Poco::Net diff --git a/Net/src/HTTPServerConnectionFactory.cpp b/Net/src/HTTPServerConnectionFactory.cpp index 85e7cd86e..4e5f7dc9b 100644 --- a/Net/src/HTTPServerConnectionFactory.cpp +++ b/Net/src/HTTPServerConnectionFactory.cpp @@ -1,7 +1,7 @@ // // HTTPServerConnectionFactory.cpp // -// $Id: //poco/1.3/Net/src/HTTPServerConnectionFactory.cpp#1 $ +// $Id: //poco/Main/Net/src/HTTPServerConnectionFactory.cpp#6 $ // // Library: Net // Package: HTTPServer diff --git a/Net/src/HTTPServerParams.cpp b/Net/src/HTTPServerParams.cpp index 1a3c69609..12585a9c5 100644 --- a/Net/src/HTTPServerParams.cpp +++ b/Net/src/HTTPServerParams.cpp @@ -1,7 +1,7 @@ // // HTTPServerParams.cpp // -// $Id: //poco/1.3/Net/src/HTTPServerParams.cpp#1 $ +// $Id: //poco/Main/Net/src/HTTPServerParams.cpp#5 $ // // Library: Net // Package: HTTPServer diff --git a/Net/src/HTTPServerRequest.cpp b/Net/src/HTTPServerRequest.cpp index faad3878f..58f900a0c 100644 --- a/Net/src/HTTPServerRequest.cpp +++ b/Net/src/HTTPServerRequest.cpp @@ -1,7 +1,7 @@ // // HTTPServerRequest.cpp // -// $Id: //poco/1.3/Net/src/HTTPServerRequest.cpp#1 $ +// $Id: //poco/Main/Net/src/HTTPServerRequest.cpp#6 $ // // Library: Net // Package: HTTPServer diff --git a/Net/src/HTTPServerResponse.cpp b/Net/src/HTTPServerResponse.cpp index 8ca694091..7c8030709 100644 --- a/Net/src/HTTPServerResponse.cpp +++ b/Net/src/HTTPServerResponse.cpp @@ -1,7 +1,7 @@ // // HTTPServerResponse.cpp // -// $Id: //poco/1.3/Net/src/HTTPServerResponse.cpp#1 $ +// $Id: //poco/Main/Net/src/HTTPServerResponse.cpp#10 $ // // Library: Net // Package: HTTPServer @@ -44,6 +44,7 @@ #include "Poco/Timestamp.h" #include "Poco/NumberFormatter.h" #include "Poco/StreamCopier.h" +#include "Poco/CountingStream.h" #include "Poco/Exception.h" #include @@ -85,20 +86,23 @@ std::ostream& HTTPServerResponse::send() if (getChunkedTransferEncoding()) { + HTTPHeaderOutputStream hs(_session); + write(hs); _pStream = new HTTPChunkedOutputStream(_session); } else if (getContentLength() != HTTPMessage::UNKNOWN_CONTENT_LENGTH) { - _pStream = new HTTPFixedLengthOutputStream(_session, getContentLength()); + Poco::CountingOutputStream cs; + write(cs); + _pStream = new HTTPFixedLengthOutputStream(_session, getContentLength() + cs.chars()); + write(*_pStream); } else { _pStream = new HTTPOutputStream(_session); setKeepAlive(false); + write(*_pStream); } - HTTPHeaderOutputStream hs(_session); - write(hs); - return *_pStream; } @@ -111,19 +115,34 @@ void HTTPServerResponse::sendFile(const std::string& path, const std::string& me Timestamp dateTime = f.getLastModified(); File::FileSize length = f.getSize(); setDate(dateTime); - setContentLength((int) length); + setContentLength(static_cast(length)); setContentType(mediaType); + setChunkedTransferEncoding(false); std::ifstream istr(path.c_str(), std::ios::binary | std::ios::in); if (istr.good()) { - send(); + _pStream = new HTTPOutputStream(_session); + write(*_pStream); StreamCopier::copyStream(istr, *_pStream); } else throw OpenFileException(path); } +void HTTPServerResponse::sendBuffer(const void* pBuffer, std::size_t length) +{ + poco_assert (!_pStream); + + setContentLength(static_cast(length)); + setChunkedTransferEncoding(false); + + _pStream = new HTTPOutputStream(_session); + write(*_pStream); + _pStream->write(static_cast(pBuffer), static_cast(length)); +} + + void HTTPServerResponse::redirect(const std::string& uri) { poco_assert (!_pStream); @@ -131,8 +150,8 @@ void HTTPServerResponse::redirect(const std::string& uri) setStatusAndReason(HTTPResponse::HTTP_FOUND); set("Location", uri); - HTTPHeaderOutputStream hs(_session); - write(hs); + _pStream = new HTTPOutputStream(_session); + write(*_pStream); } diff --git a/Net/src/HTTPServerSession.cpp b/Net/src/HTTPServerSession.cpp index 3bdb9f85f..35f476013 100644 --- a/Net/src/HTTPServerSession.cpp +++ b/Net/src/HTTPServerSession.cpp @@ -1,7 +1,7 @@ // // HTTPServerSession.cpp // -// $Id: //poco/1.3/Net/src/HTTPServerSession.cpp#2 $ +// $Id: //poco/Main/Net/src/HTTPServerSession.cpp#7 $ // // Library: Net // Package: HTTPServer diff --git a/Net/src/HTTPSession.cpp b/Net/src/HTTPSession.cpp index 405582ce9..70b9fdd9b 100644 --- a/Net/src/HTTPSession.cpp +++ b/Net/src/HTTPSession.cpp @@ -1,7 +1,7 @@ // // HTTPSession.cpp // -// $Id: //poco/1.3/Net/src/HTTPSession.cpp#1 $ +// $Id: //poco/Main/Net/src/HTTPSession.cpp#10 $ // // Library: Net // Package: HTTP @@ -192,6 +192,7 @@ bool HTTPSession::connected() const void HTTPSession::connect(const SocketAddress& address) { _socket.connect(address, _timeout); + _socket.setNoDelay(true); } diff --git a/Net/src/HTTPSessionFactory.cpp b/Net/src/HTTPSessionFactory.cpp index e14945811..2c29fe576 100644 --- a/Net/src/HTTPSessionFactory.cpp +++ b/Net/src/HTTPSessionFactory.cpp @@ -1,7 +1,7 @@ // // HTTPSessionFactory.cpp // -// $Id: //poco/1.3/Net/src/HTTPSessionFactory.cpp#1 $ +// $Id: //poco/Main/Net/src/HTTPSessionFactory.cpp#11 $ // // Library: Net // Package: HTTPClient diff --git a/Net/src/HTTPSessionInstantiator.cpp b/Net/src/HTTPSessionInstantiator.cpp index f3e23ca2b..40d980d78 100644 --- a/Net/src/HTTPSessionInstantiator.cpp +++ b/Net/src/HTTPSessionInstantiator.cpp @@ -1,7 +1,7 @@ // // HTTPSessionInstantiator.cpp // -// $Id: //poco/1.3/Net/src/HTTPSessionInstantiator.cpp#1 $ +// $Id: //poco/Main/Net/src/HTTPSessionInstantiator.cpp#4 $ // // Library: Net // Package: HTTPClient diff --git a/Net/src/HTTPStream.cpp b/Net/src/HTTPStream.cpp index 7d3bb865a..d23dd0c2b 100644 --- a/Net/src/HTTPStream.cpp +++ b/Net/src/HTTPStream.cpp @@ -1,7 +1,7 @@ // // HTTPStream.cpp // -// $Id: //poco/1.3/Net/src/HTTPStream.cpp#1 $ +// $Id: //poco/Main/Net/src/HTTPStream.cpp#9 $ // // Library: Net // Package: HTTP diff --git a/Net/src/HTTPStreamFactory.cpp b/Net/src/HTTPStreamFactory.cpp index 18e1aed06..3da9f28a7 100644 --- a/Net/src/HTTPStreamFactory.cpp +++ b/Net/src/HTTPStreamFactory.cpp @@ -1,7 +1,7 @@ // // HTTPStreamFactory.cpp // -// $Id: //poco/1.3/Net/src/HTTPStreamFactory.cpp#1 $ +// $Id: //poco/Main/Net/src/HTTPStreamFactory.cpp#11 $ // // Library: Net // Package: HTTP diff --git a/Net/src/HostEntry.cpp b/Net/src/HostEntry.cpp index 8c146c20d..d269dafd6 100644 --- a/Net/src/HostEntry.cpp +++ b/Net/src/HostEntry.cpp @@ -1,7 +1,7 @@ // // HostEntry.cpp // -// $Id: //poco/1.3/Net/src/HostEntry.cpp#1 $ +// $Id: //poco/Main/Net/src/HostEntry.cpp#7 $ // // Library: Net // Package: NetCore diff --git a/Net/src/ICMPClient.cpp b/Net/src/ICMPClient.cpp index ee8de2643..b762cc3e9 100644 --- a/Net/src/ICMPClient.cpp +++ b/Net/src/ICMPClient.cpp @@ -1,7 +1,7 @@ // // ICMPClient.cpp // -// $Id: //poco/1.3/Net/src/ICMPClient.cpp#1 $ +// $Id: //poco/Main/Net/src/ICMPClient.cpp#5 $ // // Library: Net // Package: ICMP diff --git a/Net/src/ICMPEventArgs.cpp b/Net/src/ICMPEventArgs.cpp index e5985a02e..506ed9069 100644 --- a/Net/src/ICMPEventArgs.cpp +++ b/Net/src/ICMPEventArgs.cpp @@ -1,7 +1,7 @@ // // ICMPEventArgs.cpp // -// $Id: //poco/1.3/Net/src/ICMPEventArgs.cpp#1 $ +// $Id: //poco/Main/Net/src/ICMPEventArgs.cpp#6 $ // // Library: Net // Package: ICMP diff --git a/Net/src/ICMPPacket.cpp b/Net/src/ICMPPacket.cpp index 3e89f2d2a..40435703e 100644 --- a/Net/src/ICMPPacket.cpp +++ b/Net/src/ICMPPacket.cpp @@ -1,7 +1,7 @@ // // ICMPPacket.cpp // -// $Id: //poco/1.3/Net/src/ICMPPacket.cpp#1 $ +// $Id: //poco/Main/Net/src/ICMPPacket.cpp#4 $ // // Library: Net // Package: ICMP diff --git a/Net/src/ICMPPacketImpl.cpp b/Net/src/ICMPPacketImpl.cpp index 8e07cdcd5..37b064e0d 100644 --- a/Net/src/ICMPPacketImpl.cpp +++ b/Net/src/ICMPPacketImpl.cpp @@ -1,7 +1,7 @@ // // ICMPPacketImpl.cpp // -// $Id: //poco/1.3/Net/src/ICMPPacketImpl.cpp#1 $ +// $Id: //poco/Main/Net/src/ICMPPacketImpl.cpp#5 $ // // Library: Net // Package: ICMP diff --git a/Net/src/ICMPSocket.cpp b/Net/src/ICMPSocket.cpp index 1b21d90ef..c626d9c55 100644 --- a/Net/src/ICMPSocket.cpp +++ b/Net/src/ICMPSocket.cpp @@ -1,7 +1,7 @@ // // ICMPSocket.cpp // -// $Id: //poco/1.3/Net/src/ICMPSocket.cpp#1 $ +// $Id: //poco/Main/Net/src/ICMPSocket.cpp#4 $ // // Library: Net // Package: ICMP diff --git a/Net/src/ICMPSocketImpl.cpp b/Net/src/ICMPSocketImpl.cpp index f2b7bc957..f29b910e8 100644 --- a/Net/src/ICMPSocketImpl.cpp +++ b/Net/src/ICMPSocketImpl.cpp @@ -1,7 +1,7 @@ // // ICMPSocketImpl.cpp // -// $Id: //poco/1.3/Net/src/ICMPSocketImpl.cpp#1 $ +// $Id: //poco/Main/Net/src/ICMPSocketImpl.cpp#5 $ // // Library: Net // Package: ICMP diff --git a/Net/src/ICMPv4PacketImpl.cpp b/Net/src/ICMPv4PacketImpl.cpp index 060c5a5fa..c3c698e75 100644 --- a/Net/src/ICMPv4PacketImpl.cpp +++ b/Net/src/ICMPv4PacketImpl.cpp @@ -1,7 +1,7 @@ // // ICMPv4PacketImpl.cpp // -// $Id: //poco/1.3/Net/src/ICMPv4PacketImpl.cpp#1 $ +// $Id: //poco/Main/Net/src/ICMPv4PacketImpl.cpp#4 $ // // Library: Net // Package: ICMP diff --git a/Net/src/IPAddress.cpp b/Net/src/IPAddress.cpp index f696a7c1e..c14f15929 100644 --- a/Net/src/IPAddress.cpp +++ b/Net/src/IPAddress.cpp @@ -1,7 +1,7 @@ // // IPAddress.cpp // -// $Id: //poco/1.3/Net/src/IPAddress.cpp#2 $ +// $Id: //poco/Main/Net/src/IPAddress.cpp#13 $ // // Library: Net // Package: NetCore diff --git a/Net/src/MailMessage.cpp b/Net/src/MailMessage.cpp index c6ecd151c..68e5237a1 100644 --- a/Net/src/MailMessage.cpp +++ b/Net/src/MailMessage.cpp @@ -1,7 +1,7 @@ // // MailMessage.cpp // -// $Id: //poco/1.3/Net/src/MailMessage.cpp#1 $ +// $Id: //poco/Main/Net/src/MailMessage.cpp#9 $ // // Library: Net // Package: Mail diff --git a/Net/src/MailRecipient.cpp b/Net/src/MailRecipient.cpp index 0d494a4dc..26b2a9142 100644 --- a/Net/src/MailRecipient.cpp +++ b/Net/src/MailRecipient.cpp @@ -1,7 +1,7 @@ // // MailRecipient.cpp // -// $Id: //poco/1.3/Net/src/MailRecipient.cpp#1 $ +// $Id: //poco/Main/Net/src/MailRecipient.cpp#6 $ // // Library: Net // Package: Mail diff --git a/Net/src/MailStream.cpp b/Net/src/MailStream.cpp index a763d29fa..1237cdec5 100644 --- a/Net/src/MailStream.cpp +++ b/Net/src/MailStream.cpp @@ -1,7 +1,7 @@ // // MailStream.cpp // -// $Id: //poco/1.3/Net/src/MailStream.cpp#1 $ +// $Id: //poco/Main/Net/src/MailStream.cpp#6 $ // // Library: Net // Package: Mail diff --git a/Net/src/MediaType.cpp b/Net/src/MediaType.cpp index 5e28c47ae..effd29d1d 100644 --- a/Net/src/MediaType.cpp +++ b/Net/src/MediaType.cpp @@ -1,7 +1,7 @@ // // MediaType.cpp // -// $Id: //poco/1.3/Net/src/MediaType.cpp#1 $ +// $Id: //poco/Main/Net/src/MediaType.cpp#7 $ // // Library: Net // Package: Messages diff --git a/Net/src/MessageHeader.cpp b/Net/src/MessageHeader.cpp index b94422709..b25e7cf0d 100644 --- a/Net/src/MessageHeader.cpp +++ b/Net/src/MessageHeader.cpp @@ -1,7 +1,7 @@ // // MessageHeader.cpp // -// $Id: //poco/1.3/Net/src/MessageHeader.cpp#1 $ +// $Id: //poco/Main/Net/src/MessageHeader.cpp#11 $ // // Library: Net // Package: Messages diff --git a/Net/src/MulticastSocket.cpp b/Net/src/MulticastSocket.cpp index 69f32810f..4b42c928a 100644 --- a/Net/src/MulticastSocket.cpp +++ b/Net/src/MulticastSocket.cpp @@ -1,7 +1,7 @@ // // MulticastSocket.cpp // -// $Id: //poco/1.3/Net/src/MulticastSocket.cpp#2 $ +// $Id: //poco/Main/Net/src/MulticastSocket.cpp#10 $ // // Library: Net // Package: Sockets diff --git a/Net/src/MultipartReader.cpp b/Net/src/MultipartReader.cpp index 36a1304d1..2f0c17423 100644 --- a/Net/src/MultipartReader.cpp +++ b/Net/src/MultipartReader.cpp @@ -1,7 +1,7 @@ // // MultipartReader.cpp // -// $Id: //poco/1.3/Net/src/MultipartReader.cpp#1 $ +// $Id: //poco/Main/Net/src/MultipartReader.cpp#10 $ // // Library: Net // Package: Messages diff --git a/Net/src/MultipartWriter.cpp b/Net/src/MultipartWriter.cpp index 2d9d39d26..872a87403 100644 --- a/Net/src/MultipartWriter.cpp +++ b/Net/src/MultipartWriter.cpp @@ -1,7 +1,7 @@ // // MultipartWriter.cpp // -// $Id: //poco/1.3/Net/src/MultipartWriter.cpp#2 $ +// $Id: //poco/Main/Net/src/MultipartWriter.cpp#7 $ // // Library: Net // Package: Messages diff --git a/Net/src/NameValueCollection.cpp b/Net/src/NameValueCollection.cpp index e2b8cbc76..fd687f221 100644 --- a/Net/src/NameValueCollection.cpp +++ b/Net/src/NameValueCollection.cpp @@ -1,7 +1,7 @@ // // NameValueCollection.cpp // -// $Id: //poco/1.3/Net/src/NameValueCollection.cpp#1 $ +// $Id: //poco/Main/Net/src/NameValueCollection.cpp#7 $ // // Library: Net // Package: Messages diff --git a/Net/src/NetException.cpp b/Net/src/NetException.cpp index db0c36711..16b9f8dc8 100644 --- a/Net/src/NetException.cpp +++ b/Net/src/NetException.cpp @@ -1,7 +1,7 @@ // // NetException.cpp // -// $Id: //poco/1.3/Net/src/NetException.cpp#1 $ +// $Id: //poco/Main/Net/src/NetException.cpp#15 $ // // Library: Net // Package: NetCore diff --git a/Net/src/NetworkInterface.cpp b/Net/src/NetworkInterface.cpp index 080526564..92eb606e2 100644 --- a/Net/src/NetworkInterface.cpp +++ b/Net/src/NetworkInterface.cpp @@ -1,7 +1,7 @@ // // NetworkInterface.cpp // -// $Id: //poco/1.3/Net/src/NetworkInterface.cpp#1 $ +// $Id: //poco/Main/Net/src/NetworkInterface.cpp#16 $ // // Library: Net // Package: Sockets diff --git a/Net/src/NullPartHandler.cpp b/Net/src/NullPartHandler.cpp index e640858fc..232d01fd7 100644 --- a/Net/src/NullPartHandler.cpp +++ b/Net/src/NullPartHandler.cpp @@ -1,7 +1,7 @@ // // NullPartHandler.cpp // -// $Id: //poco/1.3/Net/src/NullPartHandler.cpp#1 $ +// $Id: //poco/Main/Net/src/NullPartHandler.cpp#5 $ // // Library: Net // Package: Messages diff --git a/Net/src/POP3ClientSession.cpp b/Net/src/POP3ClientSession.cpp index 235814e49..7e97abf71 100644 --- a/Net/src/POP3ClientSession.cpp +++ b/Net/src/POP3ClientSession.cpp @@ -1,7 +1,7 @@ // // POP3ClientSession.cpp // -// $Id: //poco/1.3/Net/src/POP3ClientSession.cpp#1 $ +// $Id: //poco/Main/Net/src/POP3ClientSession.cpp#6 $ // // Library: Net // Package: Mail diff --git a/Net/src/PartHandler.cpp b/Net/src/PartHandler.cpp index 8da777846..eb9b96901 100644 --- a/Net/src/PartHandler.cpp +++ b/Net/src/PartHandler.cpp @@ -1,7 +1,7 @@ // // PartHandler.cpp // -// $Id: //poco/1.3/Net/src/PartHandler.cpp#1 $ +// $Id: //poco/Main/Net/src/PartHandler.cpp#6 $ // // Library: Net // Package: Messages diff --git a/Net/src/PartSource.cpp b/Net/src/PartSource.cpp index f73836210..0bec9d1ae 100644 --- a/Net/src/PartSource.cpp +++ b/Net/src/PartSource.cpp @@ -1,7 +1,7 @@ // // PartSource.cpp // -// $Id: //poco/1.3/Net/src/PartSource.cpp#1 $ +// $Id: //poco/Main/Net/src/PartSource.cpp#7 $ // // Library: Net // Package: Messages diff --git a/Net/src/QuotedPrintableDecoder.cpp b/Net/src/QuotedPrintableDecoder.cpp index 994537d87..e58bc836c 100644 --- a/Net/src/QuotedPrintableDecoder.cpp +++ b/Net/src/QuotedPrintableDecoder.cpp @@ -1,7 +1,7 @@ // // QuotedPrintableDecoder.cpp // -// $Id: //poco/1.3/Net/src/QuotedPrintableDecoder.cpp#1 $ +// $Id: //poco/Main/Net/src/QuotedPrintableDecoder.cpp#8 $ // // Library: Net // Package: Messages diff --git a/Net/src/QuotedPrintableEncoder.cpp b/Net/src/QuotedPrintableEncoder.cpp index e163680af..05ca2eb8c 100644 --- a/Net/src/QuotedPrintableEncoder.cpp +++ b/Net/src/QuotedPrintableEncoder.cpp @@ -1,7 +1,7 @@ // // QuotedPrintableEncoder.cpp // -// $Id: //poco/1.3/Net/src/QuotedPrintableEncoder.cpp#1 $ +// $Id: //poco/Main/Net/src/QuotedPrintableEncoder.cpp#6 $ // // Library: Net // Package: Messages diff --git a/Net/src/RawSocket.cpp b/Net/src/RawSocket.cpp index 86bfc1975..183f05bed 100644 --- a/Net/src/RawSocket.cpp +++ b/Net/src/RawSocket.cpp @@ -1,7 +1,7 @@ // // RawSocket.cpp // -// $Id: //poco/1.3/Net/src/RawSocket.cpp#1 $ +// $Id: //poco/Main/Net/src/RawSocket.cpp#4 $ // // Library: Net // Package: Sockets diff --git a/Net/src/RawSocketImpl.cpp b/Net/src/RawSocketImpl.cpp index 2a1bb5eb7..7178dfbe5 100644 --- a/Net/src/RawSocketImpl.cpp +++ b/Net/src/RawSocketImpl.cpp @@ -1,7 +1,7 @@ // // RawSocketImpl.cpp // -// $Id: //poco/1.3/Net/src/RawSocketImpl.cpp#1 $ +// $Id: //poco/Main/Net/src/RawSocketImpl.cpp#9 $ // // Library: Net // Package: Sockets diff --git a/Net/src/RemoteSyslogChannel.cpp b/Net/src/RemoteSyslogChannel.cpp index dc802104c..92e6f23ed 100644 --- a/Net/src/RemoteSyslogChannel.cpp +++ b/Net/src/RemoteSyslogChannel.cpp @@ -1,7 +1,7 @@ // // RemoteSyslogChannel.cpp // -// $Id: //poco/1.3/Net/src/RemoteSyslogChannel.cpp#1 $ +// $Id: //poco/Main/Net/src/RemoteSyslogChannel.cpp#2 $ // // Library: Net // Package: Logging diff --git a/Net/src/SMTPClientSession.cpp b/Net/src/SMTPClientSession.cpp index 016a23bd6..fa0be0013 100644 --- a/Net/src/SMTPClientSession.cpp +++ b/Net/src/SMTPClientSession.cpp @@ -1,7 +1,7 @@ // // SMTPClientSession.cpp // -// $Id: //poco/1.3/Net/src/SMTPClientSession.cpp#2 $ +// $Id: //poco/Main/Net/src/SMTPClientSession.cpp#8 $ // // Library: Net // Package: Mail diff --git a/Net/src/ServerSocket.cpp b/Net/src/ServerSocket.cpp index c8a58fb4d..693ebfe7b 100644 --- a/Net/src/ServerSocket.cpp +++ b/Net/src/ServerSocket.cpp @@ -1,7 +1,7 @@ // // ServerSocket.cpp // -// $Id: //poco/1.3/Net/src/ServerSocket.cpp#1 $ +// $Id: //poco/Main/Net/src/ServerSocket.cpp#11 $ // // Library: Net // Package: Sockets diff --git a/Net/src/ServerSocketImpl.cpp b/Net/src/ServerSocketImpl.cpp index ad9c6bcfd..f1734808a 100644 --- a/Net/src/ServerSocketImpl.cpp +++ b/Net/src/ServerSocketImpl.cpp @@ -1,7 +1,7 @@ // // ServerSocketImpl.cpp // -// $Id: //poco/1.3/Net/src/ServerSocketImpl.cpp#1 $ +// $Id: //poco/Main/Net/src/ServerSocketImpl.cpp#5 $ // // Library: Net // Package: Sockets diff --git a/Net/src/Socket.cpp b/Net/src/Socket.cpp index 96bb58085..5008aefcd 100644 --- a/Net/src/Socket.cpp +++ b/Net/src/Socket.cpp @@ -1,7 +1,7 @@ // // Socket.cpp // -// $Id: //poco/1.3/Net/src/Socket.cpp#1 $ +// $Id: //poco/Main/Net/src/Socket.cpp#10 $ // // Library: Net // Package: Sockets diff --git a/Net/src/SocketAddress.cpp b/Net/src/SocketAddress.cpp index 0b2c4971f..fb09dbd36 100644 --- a/Net/src/SocketAddress.cpp +++ b/Net/src/SocketAddress.cpp @@ -1,7 +1,7 @@ // // SocketAddress.cpp // -// $Id: //poco/1.3/Net/src/SocketAddress.cpp#1 $ +// $Id: //poco/Main/Net/src/SocketAddress.cpp#12 $ // // Library: Net // Package: NetCore diff --git a/Net/src/SocketImpl.cpp b/Net/src/SocketImpl.cpp index e9b9add0a..7419e215c 100644 --- a/Net/src/SocketImpl.cpp +++ b/Net/src/SocketImpl.cpp @@ -1,7 +1,7 @@ // // SocketImpl.cpp // -// $Id: //poco/1.3/Net/src/SocketImpl.cpp#1 $ +// $Id: //poco/Main/Net/src/SocketImpl.cpp#17 $ // // Library: Net // Package: Sockets diff --git a/Net/src/SocketNotification.cpp b/Net/src/SocketNotification.cpp index a4572f483..9bc1f4f41 100644 --- a/Net/src/SocketNotification.cpp +++ b/Net/src/SocketNotification.cpp @@ -1,7 +1,7 @@ // // SocketNotification.cpp // -// $Id: //poco/1.3/Net/src/SocketNotification.cpp#1 $ +// $Id: //poco/Main/Net/src/SocketNotification.cpp#5 $ // // Library: Net // Package: Reactor diff --git a/Net/src/SocketNotifier.cpp b/Net/src/SocketNotifier.cpp index aac39e452..e23829a7c 100644 --- a/Net/src/SocketNotifier.cpp +++ b/Net/src/SocketNotifier.cpp @@ -1,7 +1,7 @@ // // SocketNotifier.cpp // -// $Id: //poco/1.3/Net/src/SocketNotifier.cpp#2 $ +// $Id: //poco/Main/Net/src/SocketNotifier.cpp#9 $ // // Library: Net // Package: Reactor diff --git a/Net/src/SocketReactor.cpp b/Net/src/SocketReactor.cpp index b6dabc7a4..02a292e99 100644 --- a/Net/src/SocketReactor.cpp +++ b/Net/src/SocketReactor.cpp @@ -1,7 +1,7 @@ // // SocketReactor.cpp // -// $Id: //poco/1.3/Net/src/SocketReactor.cpp#1 $ +// $Id: //poco/Main/Net/src/SocketReactor.cpp#5 $ // // Library: Net // Package: Reactor diff --git a/Net/src/SocketStream.cpp b/Net/src/SocketStream.cpp index 935a04be2..e37828114 100644 --- a/Net/src/SocketStream.cpp +++ b/Net/src/SocketStream.cpp @@ -1,7 +1,7 @@ // // SocketStream.cpp // -// $Id: //poco/1.3/Net/src/SocketStream.cpp#1 $ +// $Id: //poco/Main/Net/src/SocketStream.cpp#8 $ // // Library: Net // Package: Sockets diff --git a/Net/src/StreamSocket.cpp b/Net/src/StreamSocket.cpp index fc21f4a99..dcf83369b 100644 --- a/Net/src/StreamSocket.cpp +++ b/Net/src/StreamSocket.cpp @@ -1,7 +1,7 @@ // // StreamSocket.cpp // -// $Id: //poco/1.3/Net/src/StreamSocket.cpp#1 $ +// $Id: //poco/Main/Net/src/StreamSocket.cpp#8 $ // // Library: Net // Package: Sockets diff --git a/Net/src/StreamSocketImpl.cpp b/Net/src/StreamSocketImpl.cpp index eb1c37c93..3eae22449 100644 --- a/Net/src/StreamSocketImpl.cpp +++ b/Net/src/StreamSocketImpl.cpp @@ -1,7 +1,7 @@ // // StreamSocketImpl.cpp // -// $Id: //poco/1.3/Net/src/StreamSocketImpl.cpp#1 $ +// $Id: //poco/Main/Net/src/StreamSocketImpl.cpp#6 $ // // Library: Net // Package: Sockets diff --git a/Net/src/StringPartSource.cpp b/Net/src/StringPartSource.cpp index 8fed81a86..95374a830 100644 --- a/Net/src/StringPartSource.cpp +++ b/Net/src/StringPartSource.cpp @@ -1,7 +1,7 @@ // // StringPartSource.cpp // -// $Id: //poco/1.3/Net/src/StringPartSource.cpp#1 $ +// $Id: //poco/Main/Net/src/StringPartSource.cpp#7 $ // // Library: Net // Package: Messages diff --git a/Net/src/TCPServer.cpp b/Net/src/TCPServer.cpp index aa90c4b85..8a8142e1f 100644 --- a/Net/src/TCPServer.cpp +++ b/Net/src/TCPServer.cpp @@ -1,7 +1,7 @@ // // TCPServer.cpp // -// $Id: //poco/1.3/Net/src/TCPServer.cpp#1 $ +// $Id: //poco/Main/Net/src/TCPServer.cpp#10 $ // // Library: Net // Package: TCPServer @@ -102,14 +102,16 @@ void TCPServer::stop() void TCPServer::run() { - while (!_stopped) - { + while (!_stopped) + { Poco::Timespan timeout(250000); if (_socket.poll(timeout, Socket::SELECT_READ)) { try { StreamSocket ss = _socket.acceptConnection(); + // enabe nodelay per default: OSX really needs that + ss.setNoDelay(true); _pDispatcher->enqueue(ss); } catch (Poco::Exception& exc) @@ -125,7 +127,7 @@ void TCPServer::run() ErrorHandler::handle(); } } - } + } } diff --git a/Net/src/TCPServerConnection.cpp b/Net/src/TCPServerConnection.cpp index 0ad72e2a1..78e7d0f03 100644 --- a/Net/src/TCPServerConnection.cpp +++ b/Net/src/TCPServerConnection.cpp @@ -1,7 +1,7 @@ // // TCPServerConnection.cpp // -// $Id: //poco/1.3/Net/src/TCPServerConnection.cpp#1 $ +// $Id: //poco/Main/Net/src/TCPServerConnection.cpp#7 $ // // Library: Net // Package: TCPServer diff --git a/Net/src/TCPServerConnectionFactory.cpp b/Net/src/TCPServerConnectionFactory.cpp index 5b6db7348..3deff074d 100644 --- a/Net/src/TCPServerConnectionFactory.cpp +++ b/Net/src/TCPServerConnectionFactory.cpp @@ -1,7 +1,7 @@ // // TCPServerConnectionFactory.cpp // -// $Id: //poco/1.3/Net/src/TCPServerConnectionFactory.cpp#1 $ +// $Id: //poco/Main/Net/src/TCPServerConnectionFactory.cpp#6 $ // // Library: Net // Package: TCPServer diff --git a/Net/src/TCPServerDispatcher.cpp b/Net/src/TCPServerDispatcher.cpp index 1961f2286..da2e32c8c 100644 --- a/Net/src/TCPServerDispatcher.cpp +++ b/Net/src/TCPServerDispatcher.cpp @@ -1,7 +1,7 @@ // // TCPServerDispatcher.cpp // -// $Id: //poco/1.3/Net/src/TCPServerDispatcher.cpp#1 $ +// $Id: //poco/Main/Net/src/TCPServerDispatcher.cpp#8 $ // // Library: Net // Package: TCPServer diff --git a/Net/src/TCPServerParams.cpp b/Net/src/TCPServerParams.cpp index 5a267829f..3d152d668 100644 --- a/Net/src/TCPServerParams.cpp +++ b/Net/src/TCPServerParams.cpp @@ -1,7 +1,7 @@ // // TCPServerParams.cpp // -// $Id: //poco/1.3/Net/src/TCPServerParams.cpp#1 $ +// $Id: //poco/Main/Net/src/TCPServerParams.cpp#6 $ // // Library: Net // Package: TCPServer diff --git a/Net/testsuite/Makefile b/Net/testsuite/Makefile index 5d3ede6f0..762701c9f 100644 --- a/Net/testsuite/Makefile +++ b/Net/testsuite/Makefile @@ -1,7 +1,7 @@ # # Makefile # -# $Id: //poco/1.3/Net/testsuite/Makefile#1 $ +# $Id: //poco/Main/Net/testsuite/Makefile#20 $ # # Makefile for Poco Net testsuite # diff --git a/Net/testsuite/TestSuite.vmsbuild b/Net/testsuite/TestSuite.vmsbuild index f13968209..3b50f7e93 100644 --- a/Net/testsuite/TestSuite.vmsbuild +++ b/Net/testsuite/TestSuite.vmsbuild @@ -1,7 +1,7 @@ # # TestSuite.vmsbuild # -# $Id: //poco/1.3/Net/testsuite/TestSuite.vmsbuild#1 $ +# $Id: //poco/Main/Net/testsuite/TestSuite.vmsbuild#1 $ # EXE=TestRunner NetTestSuite diff --git a/Net/testsuite/src/DNSTest.cpp b/Net/testsuite/src/DNSTest.cpp index 857b82250..13336abbc 100644 --- a/Net/testsuite/src/DNSTest.cpp +++ b/Net/testsuite/src/DNSTest.cpp @@ -1,7 +1,7 @@ // // DNSTest.cpp // -// $Id: //poco/1.3/Net/testsuite/src/DNSTest.cpp#1 $ +// $Id: //poco/Main/Net/testsuite/src/DNSTest.cpp#6 $ // // Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH. // and Contributors. diff --git a/Net/testsuite/src/DNSTest.h b/Net/testsuite/src/DNSTest.h index 9f6ad8d46..b00f774ae 100644 --- a/Net/testsuite/src/DNSTest.h +++ b/Net/testsuite/src/DNSTest.h @@ -1,7 +1,7 @@ // // DNSTest.h // -// $Id: //poco/1.3/Net/testsuite/src/DNSTest.h#1 $ +// $Id: //poco/Main/Net/testsuite/src/DNSTest.h#4 $ // // Definition of the DNSTest class. // diff --git a/Net/testsuite/src/DatagramSocketTest.cpp b/Net/testsuite/src/DatagramSocketTest.cpp index 20b14f58c..c1de3474c 100644 --- a/Net/testsuite/src/DatagramSocketTest.cpp +++ b/Net/testsuite/src/DatagramSocketTest.cpp @@ -1,7 +1,7 @@ // // DatagramSocketTest.cpp // -// $Id: //poco/1.3/Net/testsuite/src/DatagramSocketTest.cpp#1 $ +// $Id: //poco/Main/Net/testsuite/src/DatagramSocketTest.cpp#9 $ // // Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH. // and Contributors. diff --git a/Net/testsuite/src/DatagramSocketTest.h b/Net/testsuite/src/DatagramSocketTest.h index 3a884b229..d80a40cfe 100644 --- a/Net/testsuite/src/DatagramSocketTest.h +++ b/Net/testsuite/src/DatagramSocketTest.h @@ -1,7 +1,7 @@ // // DatagramSocketTest.h // -// $Id: //poco/1.3/Net/testsuite/src/DatagramSocketTest.h#1 $ +// $Id: //poco/Main/Net/testsuite/src/DatagramSocketTest.h#5 $ // // Definition of the DatagramSocketTest class. // diff --git a/Net/testsuite/src/DialogServer.cpp b/Net/testsuite/src/DialogServer.cpp index b0c913628..3f0960a13 100644 --- a/Net/testsuite/src/DialogServer.cpp +++ b/Net/testsuite/src/DialogServer.cpp @@ -1,7 +1,7 @@ // // DialogServer.cpp // -// $Id: //poco/1.3/Net/testsuite/src/DialogServer.cpp#1 $ +// $Id: //poco/Main/Net/testsuite/src/DialogServer.cpp#7 $ // // Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH. // and Contributors. diff --git a/Net/testsuite/src/DialogServer.h b/Net/testsuite/src/DialogServer.h index 5cbbc4cd8..d97d5b358 100644 --- a/Net/testsuite/src/DialogServer.h +++ b/Net/testsuite/src/DialogServer.h @@ -1,7 +1,7 @@ // // DialogServer.h // -// $Id: //poco/1.3/Net/testsuite/src/DialogServer.h#1 $ +// $Id: //poco/Main/Net/testsuite/src/DialogServer.h#7 $ // // Definition of the DialogServer class. // diff --git a/Net/testsuite/src/DialogSocketTest.cpp b/Net/testsuite/src/DialogSocketTest.cpp index db1ee8f68..4e3bdfbac 100644 --- a/Net/testsuite/src/DialogSocketTest.cpp +++ b/Net/testsuite/src/DialogSocketTest.cpp @@ -1,7 +1,7 @@ // // DialogSocketTest.cpp // -// $Id: //poco/1.3/Net/testsuite/src/DialogSocketTest.cpp#1 $ +// $Id: //poco/Main/Net/testsuite/src/DialogSocketTest.cpp#6 $ // // Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH. // and Contributors. diff --git a/Net/testsuite/src/DialogSocketTest.h b/Net/testsuite/src/DialogSocketTest.h index 94ad475b5..baf68664c 100644 --- a/Net/testsuite/src/DialogSocketTest.h +++ b/Net/testsuite/src/DialogSocketTest.h @@ -1,7 +1,7 @@ // // DialogSocketTest.h // -// $Id: //poco/1.3/Net/testsuite/src/DialogSocketTest.h#1 $ +// $Id: //poco/Main/Net/testsuite/src/DialogSocketTest.h#4 $ // // Definition of the DialogSocketTest class. // diff --git a/Net/testsuite/src/Driver.cpp b/Net/testsuite/src/Driver.cpp index 750cd403f..9ac8656a8 100644 --- a/Net/testsuite/src/Driver.cpp +++ b/Net/testsuite/src/Driver.cpp @@ -1,7 +1,7 @@ // // Driver.cpp // -// $Id: //poco/1.3/Net/testsuite/src/Driver.cpp#1 $ +// $Id: //poco/Main/Net/testsuite/src/Driver.cpp#4 $ // // Console-based test driver for Poco Net. // diff --git a/Net/testsuite/src/EchoServer.cpp b/Net/testsuite/src/EchoServer.cpp index c456c3245..b72c66f98 100644 --- a/Net/testsuite/src/EchoServer.cpp +++ b/Net/testsuite/src/EchoServer.cpp @@ -1,7 +1,7 @@ // // EchoServer.cpp // -// $Id: //poco/1.3/Net/testsuite/src/EchoServer.cpp#1 $ +// $Id: //poco/Main/Net/testsuite/src/EchoServer.cpp#6 $ // // Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH. // and Contributors. diff --git a/Net/testsuite/src/EchoServer.h b/Net/testsuite/src/EchoServer.h index 22e1d4b41..160a0a931 100644 --- a/Net/testsuite/src/EchoServer.h +++ b/Net/testsuite/src/EchoServer.h @@ -1,7 +1,7 @@ // // EchoServer.h // -// $Id: //poco/1.3/Net/testsuite/src/EchoServer.h#1 $ +// $Id: //poco/Main/Net/testsuite/src/EchoServer.h#5 $ // // Definition of the EchoServer class. // diff --git a/Net/testsuite/src/FTPClientSessionTest.cpp b/Net/testsuite/src/FTPClientSessionTest.cpp index 8ce2c3d3c..d756408ba 100644 --- a/Net/testsuite/src/FTPClientSessionTest.cpp +++ b/Net/testsuite/src/FTPClientSessionTest.cpp @@ -1,7 +1,7 @@ // // FTPClientSessionTest.cpp // -// $Id: //poco/1.3/Net/testsuite/src/FTPClientSessionTest.cpp#1 $ +// $Id: //poco/Main/Net/testsuite/src/FTPClientSessionTest.cpp#6 $ // // Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH. // and Contributors. diff --git a/Net/testsuite/src/FTPClientSessionTest.h b/Net/testsuite/src/FTPClientSessionTest.h index 5ad26185a..b69fa31e2 100644 --- a/Net/testsuite/src/FTPClientSessionTest.h +++ b/Net/testsuite/src/FTPClientSessionTest.h @@ -1,7 +1,7 @@ // // FTPClientSessionTest.h // -// $Id: //poco/1.3/Net/testsuite/src/FTPClientSessionTest.h#1 $ +// $Id: //poco/Main/Net/testsuite/src/FTPClientSessionTest.h#4 $ // // Definition of the FTPClientSessionTest class. // diff --git a/Net/testsuite/src/FTPClientTestSuite.cpp b/Net/testsuite/src/FTPClientTestSuite.cpp index d32f79af3..bf681c829 100644 --- a/Net/testsuite/src/FTPClientTestSuite.cpp +++ b/Net/testsuite/src/FTPClientTestSuite.cpp @@ -1,7 +1,7 @@ // // FTPClientTestSuite.cpp // -// $Id: //poco/1.3/Net/testsuite/src/FTPClientTestSuite.cpp#1 $ +// $Id: //poco/Main/Net/testsuite/src/FTPClientTestSuite.cpp#4 $ // // Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH. // and Contributors. diff --git a/Net/testsuite/src/FTPClientTestSuite.h b/Net/testsuite/src/FTPClientTestSuite.h index f414a319e..d072b4681 100644 --- a/Net/testsuite/src/FTPClientTestSuite.h +++ b/Net/testsuite/src/FTPClientTestSuite.h @@ -1,7 +1,7 @@ // // FTPClientTestSuite.h // -// $Id: //poco/1.3/Net/testsuite/src/FTPClientTestSuite.h#1 $ +// $Id: //poco/Main/Net/testsuite/src/FTPClientTestSuite.h#4 $ // // Definition of the FTPClientTestSuite class. // diff --git a/Net/testsuite/src/FTPStreamFactoryTest.cpp b/Net/testsuite/src/FTPStreamFactoryTest.cpp index 55d898129..cac080346 100644 --- a/Net/testsuite/src/FTPStreamFactoryTest.cpp +++ b/Net/testsuite/src/FTPStreamFactoryTest.cpp @@ -1,7 +1,7 @@ // // FTPStreamFactoryTest.cpp // -// $Id: //poco/1.3/Net/testsuite/src/FTPStreamFactoryTest.cpp#1 $ +// $Id: //poco/Main/Net/testsuite/src/FTPStreamFactoryTest.cpp#5 $ // // Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH. // and Contributors. diff --git a/Net/testsuite/src/FTPStreamFactoryTest.h b/Net/testsuite/src/FTPStreamFactoryTest.h index 0f43be456..94a701253 100644 --- a/Net/testsuite/src/FTPStreamFactoryTest.h +++ b/Net/testsuite/src/FTPStreamFactoryTest.h @@ -1,7 +1,7 @@ // // FTPStreamFactoryTest.h // -// $Id: //poco/1.3/Net/testsuite/src/FTPStreamFactoryTest.h#1 $ +// $Id: //poco/Main/Net/testsuite/src/FTPStreamFactoryTest.h#4 $ // // Definition of the FTPStreamFactoryTest class. // diff --git a/Net/testsuite/src/HTMLFormTest.cpp b/Net/testsuite/src/HTMLFormTest.cpp index 262dec5fa..0b0ab4edb 100644 --- a/Net/testsuite/src/HTMLFormTest.cpp +++ b/Net/testsuite/src/HTMLFormTest.cpp @@ -1,7 +1,7 @@ // // HTMLFormTest.cpp // -// $Id: //poco/1.3/Net/testsuite/src/HTMLFormTest.cpp#2 $ +// $Id: //poco/Main/Net/testsuite/src/HTMLFormTest.cpp#10 $ // // Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH. // and Contributors. diff --git a/Net/testsuite/src/HTMLFormTest.h b/Net/testsuite/src/HTMLFormTest.h index faa94ce18..02c556d5a 100644 --- a/Net/testsuite/src/HTMLFormTest.h +++ b/Net/testsuite/src/HTMLFormTest.h @@ -1,7 +1,7 @@ // // HTMLFormTest.h // -// $Id: //poco/1.3/Net/testsuite/src/HTMLFormTest.h#1 $ +// $Id: //poco/Main/Net/testsuite/src/HTMLFormTest.h#4 $ // // Definition of the HTMLFormTest class. // diff --git a/Net/testsuite/src/HTMLTestSuite.cpp b/Net/testsuite/src/HTMLTestSuite.cpp index d5bbd74ec..a233a99d6 100644 --- a/Net/testsuite/src/HTMLTestSuite.cpp +++ b/Net/testsuite/src/HTMLTestSuite.cpp @@ -1,7 +1,7 @@ // // HTMLTestSuite.cpp // -// $Id: //poco/1.3/Net/testsuite/src/HTMLTestSuite.cpp#1 $ +// $Id: //poco/Main/Net/testsuite/src/HTMLTestSuite.cpp#4 $ // // Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH. // and Contributors. diff --git a/Net/testsuite/src/HTMLTestSuite.h b/Net/testsuite/src/HTMLTestSuite.h index f6ae0add1..ae5cd27fa 100644 --- a/Net/testsuite/src/HTMLTestSuite.h +++ b/Net/testsuite/src/HTMLTestSuite.h @@ -1,7 +1,7 @@ // // HTMLTestSuite.h // -// $Id: //poco/1.3/Net/testsuite/src/HTMLTestSuite.h#1 $ +// $Id: //poco/Main/Net/testsuite/src/HTMLTestSuite.h#4 $ // // Definition of the HTMLTestSuite class. // diff --git a/Net/testsuite/src/HTTPClientSessionTest.cpp b/Net/testsuite/src/HTTPClientSessionTest.cpp index de3e8a665..2dcde1dcb 100644 --- a/Net/testsuite/src/HTTPClientSessionTest.cpp +++ b/Net/testsuite/src/HTTPClientSessionTest.cpp @@ -1,7 +1,7 @@ // // HTTPClientSessionTest.cpp // -// $Id: //poco/1.3/Net/testsuite/src/HTTPClientSessionTest.cpp#1 $ +// $Id: //poco/Main/Net/testsuite/src/HTTPClientSessionTest.cpp#6 $ // // Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH. // and Contributors. diff --git a/Net/testsuite/src/HTTPClientSessionTest.h b/Net/testsuite/src/HTTPClientSessionTest.h index 218403f59..1c80883bb 100644 --- a/Net/testsuite/src/HTTPClientSessionTest.h +++ b/Net/testsuite/src/HTTPClientSessionTest.h @@ -1,7 +1,7 @@ // // HTTPClientSessionTest.h // -// $Id: //poco/1.3/Net/testsuite/src/HTTPClientSessionTest.h#1 $ +// $Id: //poco/Main/Net/testsuite/src/HTTPClientSessionTest.h#5 $ // // Definition of the HTTPClientSessionTest class. // diff --git a/Net/testsuite/src/HTTPClientTestSuite.cpp b/Net/testsuite/src/HTTPClientTestSuite.cpp index 18fbb3aa5..6f9248db9 100644 --- a/Net/testsuite/src/HTTPClientTestSuite.cpp +++ b/Net/testsuite/src/HTTPClientTestSuite.cpp @@ -1,7 +1,7 @@ // // HTTPClientTestSuite.cpp // -// $Id: //poco/1.3/Net/testsuite/src/HTTPClientTestSuite.cpp#1 $ +// $Id: //poco/Main/Net/testsuite/src/HTTPClientTestSuite.cpp#4 $ // // Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH. // and Contributors. diff --git a/Net/testsuite/src/HTTPClientTestSuite.h b/Net/testsuite/src/HTTPClientTestSuite.h index 6a4dd35c0..280d0e7c7 100644 --- a/Net/testsuite/src/HTTPClientTestSuite.h +++ b/Net/testsuite/src/HTTPClientTestSuite.h @@ -1,7 +1,7 @@ // // HTTPClientTestSuite.h // -// $Id: //poco/1.3/Net/testsuite/src/HTTPClientTestSuite.h#1 $ +// $Id: //poco/Main/Net/testsuite/src/HTTPClientTestSuite.h#4 $ // // Definition of the HTTPClientTestSuite class. // diff --git a/Net/testsuite/src/HTTPCookieTest.cpp b/Net/testsuite/src/HTTPCookieTest.cpp index 870830e92..298d9e492 100644 --- a/Net/testsuite/src/HTTPCookieTest.cpp +++ b/Net/testsuite/src/HTTPCookieTest.cpp @@ -1,7 +1,7 @@ // // HTTPCookieTest.cpp // -// $Id: //poco/1.3/Net/testsuite/src/HTTPCookieTest.cpp#1 $ +// $Id: //poco/Main/Net/testsuite/src/HTTPCookieTest.cpp#5 $ // // Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH. // and Contributors. diff --git a/Net/testsuite/src/HTTPCookieTest.h b/Net/testsuite/src/HTTPCookieTest.h index 156174512..f916e0450 100644 --- a/Net/testsuite/src/HTTPCookieTest.h +++ b/Net/testsuite/src/HTTPCookieTest.h @@ -1,7 +1,7 @@ // // HTTPCookieTest.h // -// $Id: //poco/1.3/Net/testsuite/src/HTTPCookieTest.h#1 $ +// $Id: //poco/Main/Net/testsuite/src/HTTPCookieTest.h#4 $ // // Definition of the HTTPCookieTest class. // diff --git a/Net/testsuite/src/HTTPCredentialsTest.cpp b/Net/testsuite/src/HTTPCredentialsTest.cpp index e1ea9e4ee..08ebba32f 100644 --- a/Net/testsuite/src/HTTPCredentialsTest.cpp +++ b/Net/testsuite/src/HTTPCredentialsTest.cpp @@ -1,7 +1,7 @@ // // HTTPCredentialsTest.cpp // -// $Id: //poco/1.3/Net/testsuite/src/HTTPCredentialsTest.cpp#1 $ +// $Id: //poco/Main/Net/testsuite/src/HTTPCredentialsTest.cpp#5 $ // // Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH. // and Contributors. diff --git a/Net/testsuite/src/HTTPCredentialsTest.h b/Net/testsuite/src/HTTPCredentialsTest.h index 4c00fd86e..50add4749 100644 --- a/Net/testsuite/src/HTTPCredentialsTest.h +++ b/Net/testsuite/src/HTTPCredentialsTest.h @@ -1,7 +1,7 @@ // // HTTPCredentialsTest.h // -// $Id: //poco/1.3/Net/testsuite/src/HTTPCredentialsTest.h#1 $ +// $Id: //poco/Main/Net/testsuite/src/HTTPCredentialsTest.h#4 $ // // Definition of the HTTPCredentialsTest class. // diff --git a/Net/testsuite/src/HTTPRequestTest.cpp b/Net/testsuite/src/HTTPRequestTest.cpp index 93fc02f76..da6faa84a 100644 --- a/Net/testsuite/src/HTTPRequestTest.cpp +++ b/Net/testsuite/src/HTTPRequestTest.cpp @@ -1,7 +1,7 @@ // // HTTPRequestTest.cpp // -// $Id: //poco/1.3/Net/testsuite/src/HTTPRequestTest.cpp#1 $ +// $Id: //poco/Main/Net/testsuite/src/HTTPRequestTest.cpp#6 $ // // Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH. // and Contributors. diff --git a/Net/testsuite/src/HTTPRequestTest.h b/Net/testsuite/src/HTTPRequestTest.h index 5dd99d6a5..04c4222fd 100644 --- a/Net/testsuite/src/HTTPRequestTest.h +++ b/Net/testsuite/src/HTTPRequestTest.h @@ -1,7 +1,7 @@ // // HTTPRequestTest.h // -// $Id: //poco/1.3/Net/testsuite/src/HTTPRequestTest.h#1 $ +// $Id: //poco/Main/Net/testsuite/src/HTTPRequestTest.h#5 $ // // Definition of the HTTPRequestTest class. // diff --git a/Net/testsuite/src/HTTPResponseTest.cpp b/Net/testsuite/src/HTTPResponseTest.cpp index 6d38b7a6a..4d2159db1 100644 --- a/Net/testsuite/src/HTTPResponseTest.cpp +++ b/Net/testsuite/src/HTTPResponseTest.cpp @@ -1,7 +1,7 @@ // // HTTPResponseTest.cpp // -// $Id: //poco/1.3/Net/testsuite/src/HTTPResponseTest.cpp#1 $ +// $Id: //poco/Main/Net/testsuite/src/HTTPResponseTest.cpp#7 $ // // Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH. // and Contributors. diff --git a/Net/testsuite/src/HTTPResponseTest.h b/Net/testsuite/src/HTTPResponseTest.h index 0a74ad89b..fcd8e7bb5 100644 --- a/Net/testsuite/src/HTTPResponseTest.h +++ b/Net/testsuite/src/HTTPResponseTest.h @@ -1,7 +1,7 @@ // // HTTPResponseTest.h // -// $Id: //poco/1.3/Net/testsuite/src/HTTPResponseTest.h#1 $ +// $Id: //poco/Main/Net/testsuite/src/HTTPResponseTest.h#6 $ // // Definition of the HTTPResponseTest class. // diff --git a/Net/testsuite/src/HTTPServerTest.cpp b/Net/testsuite/src/HTTPServerTest.cpp index c30070e32..6c9248241 100644 --- a/Net/testsuite/src/HTTPServerTest.cpp +++ b/Net/testsuite/src/HTTPServerTest.cpp @@ -1,7 +1,7 @@ // // HTTPServerTest.cpp // -// $Id: //poco/1.3/Net/testsuite/src/HTTPServerTest.cpp#2 $ +// $Id: //poco/Main/Net/testsuite/src/HTTPServerTest.cpp#11 $ // // Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH. // and Contributors. @@ -115,6 +115,16 @@ namespace } }; + class BufferRequestHandler: public HTTPRequestHandler + { + public: + void handleRequest(HTTPServerRequest& request, HTTPServerResponse& response) + { + std::string data("xxxxxxxxxx"); + response.sendBuffer(data.data(), data.length()); + } + }; + class RequestHandlerFactory: public HTTPRequestHandlerFactory { public: @@ -128,6 +138,8 @@ namespace return new RedirectRequestHandler(); else if (request.getURI() == "/auth") return new AuthRequestHandler(); + else if (request.getURI() == "/buffer") + return new BufferRequestHandler(); else return 0; } @@ -328,7 +340,61 @@ void HTTPServerTest::testClosedRequestKeepAlive() assert (!response.getChunkedTransferEncoding()); assert (!response.getKeepAlive()); assert (rbody == body); - int n = (int) rbody.size(); +} + + +void HTTPServerTest::testMaxKeepAlive() +{ + ServerSocket svs(0); + HTTPServerParams* pParams = new HTTPServerParams; + pParams->setKeepAlive(true); + pParams->setMaxKeepAliveRequests(4); + HTTPServer srv(new RequestHandlerFactory, svs, pParams); + srv.start(); + + HTTPClientSession cs("localhost", svs.address().port()); + cs.setKeepAlive(true); + HTTPRequest request("POST", "/echoBody", HTTPMessage::HTTP_1_1); + request.setContentType("text/plain"); + request.setChunkedTransferEncoding(true); + std::string body(5000, 'x'); + for (int i = 0; i < 3; ++i) + { + cs.sendRequest(request) << body; + HTTPResponse response; + std::string rbody; + cs.receiveResponse(response) >> rbody; + assert (response.getContentLength() == HTTPMessage::UNKNOWN_CONTENT_LENGTH); + assert (response.getContentType() == "text/plain"); + assert (response.getChunkedTransferEncoding()); + assert (response.getKeepAlive()); + assert (rbody == body); + } + + { + cs.sendRequest(request) << body; + HTTPResponse response; + std::string rbody; + cs.receiveResponse(response) >> rbody; + assert (response.getContentLength() == HTTPMessage::UNKNOWN_CONTENT_LENGTH); + assert (response.getContentType() == "text/plain"); + assert (response.getChunkedTransferEncoding()); + assert (!response.getKeepAlive()); + assert (rbody == body); + } + + { + cs.setKeepAlive(false); + cs.sendRequest(request) << body; + HTTPResponse response; + std::string rbody; + cs.receiveResponse(response) >> rbody; + assert (response.getContentLength() == HTTPMessage::UNKNOWN_CONTENT_LENGTH); + assert (response.getContentType() == "text/plain"); + assert (response.getChunkedTransferEncoding()); + assert (!response.getKeepAlive()); + assert (rbody == body); + } } @@ -415,6 +481,25 @@ void HTTPServerTest::testNotImpl() } +void HTTPServerTest::testBuffer() +{ + ServerSocket svs(0); + HTTPServerParams* pParams = new HTTPServerParams; + pParams->setKeepAlive(false); + HTTPServer srv(new RequestHandlerFactory, svs, pParams); + srv.start(); + + HTTPClientSession cs("localhost", svs.address().port()); + HTTPRequest request("GET", "/buffer"); + cs.sendRequest(request); + HTTPResponse response; + std::string rbody; + cs.receiveResponse(response) >> rbody; + assert (response.getStatus() == HTTPResponse::HTTP_OK); + assert (rbody == "xxxxxxxxxx"); +} + + void HTTPServerTest::setUp() { } @@ -436,10 +521,12 @@ CppUnit::Test* HTTPServerTest::suite() CppUnit_addTest(pSuite, HTTPServerTest, testIdentityRequestKeepAlive); CppUnit_addTest(pSuite, HTTPServerTest, testChunkedRequestKeepAlive); CppUnit_addTest(pSuite, HTTPServerTest, testClosedRequestKeepAlive); + CppUnit_addTest(pSuite, HTTPServerTest, testMaxKeepAlive); CppUnit_addTest(pSuite, HTTPServerTest, test100Continue); CppUnit_addTest(pSuite, HTTPServerTest, testRedirect); CppUnit_addTest(pSuite, HTTPServerTest, testAuth); CppUnit_addTest(pSuite, HTTPServerTest, testNotImpl); + CppUnit_addTest(pSuite, HTTPServerTest, testBuffer); return pSuite; } diff --git a/Net/testsuite/src/HTTPServerTest.h b/Net/testsuite/src/HTTPServerTest.h index 361337b1a..5f0384d94 100644 --- a/Net/testsuite/src/HTTPServerTest.h +++ b/Net/testsuite/src/HTTPServerTest.h @@ -1,7 +1,7 @@ // // HTTPServerTest.h // -// $Id: //poco/1.3/Net/testsuite/src/HTTPServerTest.h#1 $ +// $Id: //poco/Main/Net/testsuite/src/HTTPServerTest.h#8 $ // // Definition of the HTTPServerTest class. // @@ -53,10 +53,12 @@ public: void testIdentityRequestKeepAlive(); void testChunkedRequestKeepAlive(); void testClosedRequestKeepAlive(); + void testMaxKeepAlive(); void test100Continue(); void testRedirect(); void testAuth(); void testNotImpl(); + void testBuffer(); void setUp(); void tearDown(); diff --git a/Net/testsuite/src/HTTPServerTestSuite.cpp b/Net/testsuite/src/HTTPServerTestSuite.cpp index d7e035809..f4cea1bf9 100644 --- a/Net/testsuite/src/HTTPServerTestSuite.cpp +++ b/Net/testsuite/src/HTTPServerTestSuite.cpp @@ -1,7 +1,7 @@ // // HTTPServerTestSuite.cpp // -// $Id: //poco/1.3/Net/testsuite/src/HTTPServerTestSuite.cpp#1 $ +// $Id: //poco/Main/Net/testsuite/src/HTTPServerTestSuite.cpp#4 $ // // Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH. // and Contributors. diff --git a/Net/testsuite/src/HTTPServerTestSuite.h b/Net/testsuite/src/HTTPServerTestSuite.h index 3d8fab948..942fb8a39 100644 --- a/Net/testsuite/src/HTTPServerTestSuite.h +++ b/Net/testsuite/src/HTTPServerTestSuite.h @@ -1,7 +1,7 @@ // // HTTPServerTestSuite.h // -// $Id: //poco/1.3/Net/testsuite/src/HTTPServerTestSuite.h#1 $ +// $Id: //poco/Main/Net/testsuite/src/HTTPServerTestSuite.h#4 $ // // Definition of the HTTPServerTestSuite class. // diff --git a/Net/testsuite/src/HTTPStreamFactoryTest.cpp b/Net/testsuite/src/HTTPStreamFactoryTest.cpp index 5edadbacd..9f4dd0574 100644 --- a/Net/testsuite/src/HTTPStreamFactoryTest.cpp +++ b/Net/testsuite/src/HTTPStreamFactoryTest.cpp @@ -1,7 +1,7 @@ // // HTTPStreamFactoryTest.cpp // -// $Id: //poco/1.3/Net/testsuite/src/HTTPStreamFactoryTest.cpp#1 $ +// $Id: //poco/Main/Net/testsuite/src/HTTPStreamFactoryTest.cpp#8 $ // // Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH. // and Contributors. diff --git a/Net/testsuite/src/HTTPStreamFactoryTest.h b/Net/testsuite/src/HTTPStreamFactoryTest.h index 6836d5d95..e73b48db4 100644 --- a/Net/testsuite/src/HTTPStreamFactoryTest.h +++ b/Net/testsuite/src/HTTPStreamFactoryTest.h @@ -1,7 +1,7 @@ // // HTTPStreamFactoryTest.h // -// $Id: //poco/1.3/Net/testsuite/src/HTTPStreamFactoryTest.h#1 $ +// $Id: //poco/Main/Net/testsuite/src/HTTPStreamFactoryTest.h#6 $ // // Definition of the HTTPStreamFactoryTest class. // diff --git a/Net/testsuite/src/HTTPTestServer.cpp b/Net/testsuite/src/HTTPTestServer.cpp index cbca35c06..74c3ac515 100644 --- a/Net/testsuite/src/HTTPTestServer.cpp +++ b/Net/testsuite/src/HTTPTestServer.cpp @@ -1,7 +1,7 @@ // // HTTPTestServer.cpp // -// $Id: //poco/1.3/Net/testsuite/src/HTTPTestServer.cpp#2 $ +// $Id: //poco/Main/Net/testsuite/src/HTTPTestServer.cpp#7 $ // // Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH. // and Contributors. diff --git a/Net/testsuite/src/HTTPTestServer.h b/Net/testsuite/src/HTTPTestServer.h index f198dea94..44ba524cf 100644 --- a/Net/testsuite/src/HTTPTestServer.h +++ b/Net/testsuite/src/HTTPTestServer.h @@ -1,7 +1,7 @@ // // HTTPTestServer.h // -// $Id: //poco/1.3/Net/testsuite/src/HTTPTestServer.h#1 $ +// $Id: //poco/Main/Net/testsuite/src/HTTPTestServer.h#5 $ // // Definition of the HTTPTestServer class. // diff --git a/Net/testsuite/src/HTTPTestSuite.cpp b/Net/testsuite/src/HTTPTestSuite.cpp index 9daaa0f13..eeae07911 100644 --- a/Net/testsuite/src/HTTPTestSuite.cpp +++ b/Net/testsuite/src/HTTPTestSuite.cpp @@ -1,7 +1,7 @@ // // HTTPTestSuite.cpp // -// $Id: //poco/1.3/Net/testsuite/src/HTTPTestSuite.cpp#1 $ +// $Id: //poco/Main/Net/testsuite/src/HTTPTestSuite.cpp#6 $ // // Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH. // and Contributors. diff --git a/Net/testsuite/src/HTTPTestSuite.h b/Net/testsuite/src/HTTPTestSuite.h index e014fb615..8d391a474 100644 --- a/Net/testsuite/src/HTTPTestSuite.h +++ b/Net/testsuite/src/HTTPTestSuite.h @@ -1,7 +1,7 @@ // // HTTPTestSuite.h // -// $Id: //poco/1.3/Net/testsuite/src/HTTPTestSuite.h#1 $ +// $Id: //poco/Main/Net/testsuite/src/HTTPTestSuite.h#4 $ // // Definition of the HTTPTestSuite class. // diff --git a/Net/testsuite/src/ICMPClientTest.cpp b/Net/testsuite/src/ICMPClientTest.cpp index 60383090f..ffcd1cee5 100644 --- a/Net/testsuite/src/ICMPClientTest.cpp +++ b/Net/testsuite/src/ICMPClientTest.cpp @@ -1,7 +1,7 @@ // // ICMPClientTest.cpp // -// $Id: //poco/1.3/Net/testsuite/src/ICMPClientTest.cpp#1 $ +// $Id: //poco/Main/Net/testsuite/src/ICMPClientTest.cpp#4 $ // // Copyright (c) 2006, Applied Informatics Software Engineering GmbH. // and Contributors. diff --git a/Net/testsuite/src/ICMPClientTest.h b/Net/testsuite/src/ICMPClientTest.h index 331b6b475..d40f015b1 100644 --- a/Net/testsuite/src/ICMPClientTest.h +++ b/Net/testsuite/src/ICMPClientTest.h @@ -1,7 +1,7 @@ // // ICMPClientTest.h // -// $Id: //poco/1.3/Net/testsuite/src/ICMPClientTest.h#1 $ +// $Id: //poco/Main/Net/testsuite/src/ICMPClientTest.h#4 $ // // Definition of the ICMPClientTest class. // diff --git a/Net/testsuite/src/ICMPClientTestSuite.cpp b/Net/testsuite/src/ICMPClientTestSuite.cpp index 178215242..f5edd1e00 100644 --- a/Net/testsuite/src/ICMPClientTestSuite.cpp +++ b/Net/testsuite/src/ICMPClientTestSuite.cpp @@ -1,7 +1,7 @@ // // ICMPClientTestSuite.cpp // -// $Id: //poco/1.3/Net/testsuite/src/ICMPClientTestSuite.cpp#1 $ +// $Id: //poco/Main/Net/testsuite/src/ICMPClientTestSuite.cpp#3 $ // // Copyright (c) 2006, Applied Informatics Software Engineering GmbH. // and Contributors. diff --git a/Net/testsuite/src/ICMPClientTestSuite.h b/Net/testsuite/src/ICMPClientTestSuite.h index 905b9a1fa..ab36482c0 100644 --- a/Net/testsuite/src/ICMPClientTestSuite.h +++ b/Net/testsuite/src/ICMPClientTestSuite.h @@ -1,7 +1,7 @@ // // ICMPClientTestSuite.h // -// $Id: //poco/1.3/Net/testsuite/src/ICMPClientTestSuite.h#1 $ +// $Id: //poco/Main/Net/testsuite/src/ICMPClientTestSuite.h#3 $ // // Definition of the ICMPClientTestSuite class. // diff --git a/Net/testsuite/src/ICMPSocketTest.cpp b/Net/testsuite/src/ICMPSocketTest.cpp index 5fc9d74e7..23fc8b738 100644 --- a/Net/testsuite/src/ICMPSocketTest.cpp +++ b/Net/testsuite/src/ICMPSocketTest.cpp @@ -1,7 +1,7 @@ // // ICMPSocketTest.cpp // -// $Id: //poco/1.3/Net/testsuite/src/ICMPSocketTest.cpp#1 $ +// $Id: //poco/Main/Net/testsuite/src/ICMPSocketTest.cpp#4 $ // // Copyright (c) 2006, Applied Informatics Software Engineering GmbH. // and Contributors. diff --git a/Net/testsuite/src/ICMPSocketTest.h b/Net/testsuite/src/ICMPSocketTest.h index c4d834794..b065ccda2 100644 --- a/Net/testsuite/src/ICMPSocketTest.h +++ b/Net/testsuite/src/ICMPSocketTest.h @@ -1,7 +1,7 @@ // // ICMPSocketTest.h // -// $Id: //poco/1.3/Net/testsuite/src/ICMPSocketTest.h#1 $ +// $Id: //poco/Main/Net/testsuite/src/ICMPSocketTest.h#3 $ // // Definition of the ICMPSocketTest class. // diff --git a/Net/testsuite/src/IPAddressTest.cpp b/Net/testsuite/src/IPAddressTest.cpp index 917c92458..cfa5fab8b 100644 --- a/Net/testsuite/src/IPAddressTest.cpp +++ b/Net/testsuite/src/IPAddressTest.cpp @@ -1,7 +1,7 @@ // // IPAddressTest.cpp // -// $Id: //poco/1.3/Net/testsuite/src/IPAddressTest.cpp#1 $ +// $Id: //poco/Main/Net/testsuite/src/IPAddressTest.cpp#6 $ // // Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH. // and Contributors. diff --git a/Net/testsuite/src/IPAddressTest.h b/Net/testsuite/src/IPAddressTest.h index 2f37fc835..418996e94 100644 --- a/Net/testsuite/src/IPAddressTest.h +++ b/Net/testsuite/src/IPAddressTest.h @@ -1,7 +1,7 @@ // // IPAddressTest.h // -// $Id: //poco/1.3/Net/testsuite/src/IPAddressTest.h#1 $ +// $Id: //poco/Main/Net/testsuite/src/IPAddressTest.h#4 $ // // Definition of the IPAddressTest class. // diff --git a/Net/testsuite/src/MailMessageTest.cpp b/Net/testsuite/src/MailMessageTest.cpp index 791ac5f40..af19f8361 100644 --- a/Net/testsuite/src/MailMessageTest.cpp +++ b/Net/testsuite/src/MailMessageTest.cpp @@ -1,7 +1,7 @@ // // MailMessageTest.cpp // -// $Id: //poco/1.3/Net/testsuite/src/MailMessageTest.cpp#2 $ +// $Id: //poco/Main/Net/testsuite/src/MailMessageTest.cpp#8 $ // // Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH. // and Contributors. diff --git a/Net/testsuite/src/MailMessageTest.h b/Net/testsuite/src/MailMessageTest.h index 3606efa8a..2f486b542 100644 --- a/Net/testsuite/src/MailMessageTest.h +++ b/Net/testsuite/src/MailMessageTest.h @@ -1,7 +1,7 @@ // // MailMessageTest.h // -// $Id: //poco/1.3/Net/testsuite/src/MailMessageTest.h#1 $ +// $Id: //poco/Main/Net/testsuite/src/MailMessageTest.h#4 $ // // Definition of the MailMessageTest class. // diff --git a/Net/testsuite/src/MailStreamTest.cpp b/Net/testsuite/src/MailStreamTest.cpp index 0ae215b76..46996feda 100644 --- a/Net/testsuite/src/MailStreamTest.cpp +++ b/Net/testsuite/src/MailStreamTest.cpp @@ -1,7 +1,7 @@ // // MailStreamTest.cpp // -// $Id: //poco/1.3/Net/testsuite/src/MailStreamTest.cpp#1 $ +// $Id: //poco/Main/Net/testsuite/src/MailStreamTest.cpp#6 $ // // Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH. // and Contributors. diff --git a/Net/testsuite/src/MailStreamTest.h b/Net/testsuite/src/MailStreamTest.h index f0a41bab5..af26d5c1b 100644 --- a/Net/testsuite/src/MailStreamTest.h +++ b/Net/testsuite/src/MailStreamTest.h @@ -1,7 +1,7 @@ // // MailStreamTest.h // -// $Id: //poco/1.3/Net/testsuite/src/MailStreamTest.h#1 $ +// $Id: //poco/Main/Net/testsuite/src/MailStreamTest.h#4 $ // // Definition of the MailStreamTest class. // diff --git a/Net/testsuite/src/MailTestSuite.cpp b/Net/testsuite/src/MailTestSuite.cpp index 20e619321..746becbb3 100644 --- a/Net/testsuite/src/MailTestSuite.cpp +++ b/Net/testsuite/src/MailTestSuite.cpp @@ -1,7 +1,7 @@ // // MailTestSuite.cpp // -// $Id: //poco/1.3/Net/testsuite/src/MailTestSuite.cpp#1 $ +// $Id: //poco/Main/Net/testsuite/src/MailTestSuite.cpp#6 $ // // Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH. // and Contributors. diff --git a/Net/testsuite/src/MailTestSuite.h b/Net/testsuite/src/MailTestSuite.h index 4c1c12b80..07ca6bf01 100644 --- a/Net/testsuite/src/MailTestSuite.h +++ b/Net/testsuite/src/MailTestSuite.h @@ -1,7 +1,7 @@ // // MailTestSuite.h // -// $Id: //poco/1.3/Net/testsuite/src/MailTestSuite.h#1 $ +// $Id: //poco/Main/Net/testsuite/src/MailTestSuite.h#4 $ // // Definition of the MailTestSuite class. // diff --git a/Net/testsuite/src/MediaTypeTest.cpp b/Net/testsuite/src/MediaTypeTest.cpp index 743b0f266..e12c03ff3 100644 --- a/Net/testsuite/src/MediaTypeTest.cpp +++ b/Net/testsuite/src/MediaTypeTest.cpp @@ -1,7 +1,7 @@ // // MediaTypeTest.cpp // -// $Id: //poco/1.3/Net/testsuite/src/MediaTypeTest.cpp#1 $ +// $Id: //poco/Main/Net/testsuite/src/MediaTypeTest.cpp#5 $ // // Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH. // and Contributors. diff --git a/Net/testsuite/src/MediaTypeTest.h b/Net/testsuite/src/MediaTypeTest.h index 6d2cd8812..993a9ad5d 100644 --- a/Net/testsuite/src/MediaTypeTest.h +++ b/Net/testsuite/src/MediaTypeTest.h @@ -1,7 +1,7 @@ // // MediaTypeTest.h // -// $Id: //poco/1.3/Net/testsuite/src/MediaTypeTest.h#1 $ +// $Id: //poco/Main/Net/testsuite/src/MediaTypeTest.h#4 $ // // Definition of the MediaTypeTest class. // diff --git a/Net/testsuite/src/MessageHeaderTest.cpp b/Net/testsuite/src/MessageHeaderTest.cpp index 5f7e2b239..1e7de6020 100644 --- a/Net/testsuite/src/MessageHeaderTest.cpp +++ b/Net/testsuite/src/MessageHeaderTest.cpp @@ -1,7 +1,7 @@ // // MessageHeaderTest.cpp // -// $Id: //poco/1.3/Net/testsuite/src/MessageHeaderTest.cpp#1 $ +// $Id: //poco/Main/Net/testsuite/src/MessageHeaderTest.cpp#7 $ // // Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH. // and Contributors. diff --git a/Net/testsuite/src/MessageHeaderTest.h b/Net/testsuite/src/MessageHeaderTest.h index e6f9bdfff..dc357c6f7 100644 --- a/Net/testsuite/src/MessageHeaderTest.h +++ b/Net/testsuite/src/MessageHeaderTest.h @@ -1,7 +1,7 @@ // // MessageHeaderTest.h // -// $Id: //poco/1.3/Net/testsuite/src/MessageHeaderTest.h#1 $ +// $Id: //poco/Main/Net/testsuite/src/MessageHeaderTest.h#6 $ // // Definition of the MessageHeaderTest class. // diff --git a/Net/testsuite/src/MessagesTestSuite.cpp b/Net/testsuite/src/MessagesTestSuite.cpp index 7abcc4469..e9329d1ea 100644 --- a/Net/testsuite/src/MessagesTestSuite.cpp +++ b/Net/testsuite/src/MessagesTestSuite.cpp @@ -1,7 +1,7 @@ // // MessagesTestSuite.cpp // -// $Id: //poco/1.3/Net/testsuite/src/MessagesTestSuite.cpp#1 $ +// $Id: //poco/Main/Net/testsuite/src/MessagesTestSuite.cpp#5 $ // // Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH. // and Contributors. diff --git a/Net/testsuite/src/MessagesTestSuite.h b/Net/testsuite/src/MessagesTestSuite.h index 19cb6fdd1..ea6c3dec6 100644 --- a/Net/testsuite/src/MessagesTestSuite.h +++ b/Net/testsuite/src/MessagesTestSuite.h @@ -1,7 +1,7 @@ // // MessagesTestSuite.h // -// $Id: //poco/1.3/Net/testsuite/src/MessagesTestSuite.h#1 $ +// $Id: //poco/Main/Net/testsuite/src/MessagesTestSuite.h#4 $ // // Definition of the MessagesTestSuite class. // diff --git a/Net/testsuite/src/MulticastEchoServer.cpp b/Net/testsuite/src/MulticastEchoServer.cpp index 55c1475fc..be46582a0 100644 --- a/Net/testsuite/src/MulticastEchoServer.cpp +++ b/Net/testsuite/src/MulticastEchoServer.cpp @@ -1,7 +1,7 @@ // // MulticastEchoServer.cpp // -// $Id: //poco/1.3/Net/testsuite/src/MulticastEchoServer.cpp#1 $ +// $Id: //poco/Main/Net/testsuite/src/MulticastEchoServer.cpp#5 $ // // Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH. // and Contributors. diff --git a/Net/testsuite/src/MulticastEchoServer.h b/Net/testsuite/src/MulticastEchoServer.h index 9010b08b3..8250787a3 100644 --- a/Net/testsuite/src/MulticastEchoServer.h +++ b/Net/testsuite/src/MulticastEchoServer.h @@ -1,7 +1,7 @@ // // MulticastEchoServer.h // -// $Id: //poco/1.3/Net/testsuite/src/MulticastEchoServer.h#1 $ +// $Id: //poco/Main/Net/testsuite/src/MulticastEchoServer.h#5 $ // // Definition of the MulticastEchoServer class. // diff --git a/Net/testsuite/src/MulticastSocketTest.cpp b/Net/testsuite/src/MulticastSocketTest.cpp index da659322e..8e6015d27 100644 --- a/Net/testsuite/src/MulticastSocketTest.cpp +++ b/Net/testsuite/src/MulticastSocketTest.cpp @@ -1,7 +1,7 @@ // // MulticastSocketTest.cpp // -// $Id: //poco/1.3/Net/testsuite/src/MulticastSocketTest.cpp#1 $ +// $Id: //poco/Main/Net/testsuite/src/MulticastSocketTest.cpp#6 $ // // Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH. // and Contributors. diff --git a/Net/testsuite/src/MulticastSocketTest.h b/Net/testsuite/src/MulticastSocketTest.h index 2f7ea2fe1..9bf7da46d 100644 --- a/Net/testsuite/src/MulticastSocketTest.h +++ b/Net/testsuite/src/MulticastSocketTest.h @@ -1,7 +1,7 @@ // // MulticastSocketTest.h // -// $Id: //poco/1.3/Net/testsuite/src/MulticastSocketTest.h#1 $ +// $Id: //poco/Main/Net/testsuite/src/MulticastSocketTest.h#4 $ // // Definition of the MulticastSocketTest class. // diff --git a/Net/testsuite/src/MultipartReaderTest.cpp b/Net/testsuite/src/MultipartReaderTest.cpp index 024d16fd9..62a76e16d 100644 --- a/Net/testsuite/src/MultipartReaderTest.cpp +++ b/Net/testsuite/src/MultipartReaderTest.cpp @@ -1,7 +1,7 @@ // // MultipartReaderTest.cpp // -// $Id: //poco/1.3/Net/testsuite/src/MultipartReaderTest.cpp#1 $ +// $Id: //poco/Main/Net/testsuite/src/MultipartReaderTest.cpp#7 $ // // Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH. // and Contributors. diff --git a/Net/testsuite/src/MultipartReaderTest.h b/Net/testsuite/src/MultipartReaderTest.h index 1d7abc348..a17dab934 100644 --- a/Net/testsuite/src/MultipartReaderTest.h +++ b/Net/testsuite/src/MultipartReaderTest.h @@ -1,7 +1,7 @@ // // MultipartReaderTest.h // -// $Id: //poco/1.3/Net/testsuite/src/MultipartReaderTest.h#1 $ +// $Id: //poco/Main/Net/testsuite/src/MultipartReaderTest.h#6 $ // // Definition of the MultipartReaderTest class. // diff --git a/Net/testsuite/src/MultipartWriterTest.cpp b/Net/testsuite/src/MultipartWriterTest.cpp index a6b138e9f..7fb731e8a 100644 --- a/Net/testsuite/src/MultipartWriterTest.cpp +++ b/Net/testsuite/src/MultipartWriterTest.cpp @@ -1,7 +1,7 @@ // // MultipartWriterTest.cpp // -// $Id: //poco/1.3/Net/testsuite/src/MultipartWriterTest.cpp#2 $ +// $Id: //poco/Main/Net/testsuite/src/MultipartWriterTest.cpp#6 $ // // Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH. // and Contributors. diff --git a/Net/testsuite/src/MultipartWriterTest.h b/Net/testsuite/src/MultipartWriterTest.h index d2daf9af6..5f2ce43a2 100644 --- a/Net/testsuite/src/MultipartWriterTest.h +++ b/Net/testsuite/src/MultipartWriterTest.h @@ -1,7 +1,7 @@ // // MultipartWriterTest.h // -// $Id: //poco/1.3/Net/testsuite/src/MultipartWriterTest.h#1 $ +// $Id: //poco/Main/Net/testsuite/src/MultipartWriterTest.h#4 $ // // Definition of the MultipartWriterTest class. // diff --git a/Net/testsuite/src/NameValueCollectionTest.cpp b/Net/testsuite/src/NameValueCollectionTest.cpp index f4143bc13..670cea498 100644 --- a/Net/testsuite/src/NameValueCollectionTest.cpp +++ b/Net/testsuite/src/NameValueCollectionTest.cpp @@ -1,7 +1,7 @@ // // NameValueCollectionTest.cpp // -// $Id: //poco/1.3/Net/testsuite/src/NameValueCollectionTest.cpp#1 $ +// $Id: //poco/Main/Net/testsuite/src/NameValueCollectionTest.cpp#6 $ // // Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH. // and Contributors. diff --git a/Net/testsuite/src/NameValueCollectionTest.h b/Net/testsuite/src/NameValueCollectionTest.h index ca2a95179..ecde6819e 100644 --- a/Net/testsuite/src/NameValueCollectionTest.h +++ b/Net/testsuite/src/NameValueCollectionTest.h @@ -1,7 +1,7 @@ // // NameValueCollectionTest.h // -// $Id: //poco/1.3/Net/testsuite/src/NameValueCollectionTest.h#1 $ +// $Id: //poco/Main/Net/testsuite/src/NameValueCollectionTest.h#5 $ // // Definition of the NameValueCollectionTest class. // diff --git a/Net/testsuite/src/NetCoreTestSuite.cpp b/Net/testsuite/src/NetCoreTestSuite.cpp index 0a386ab24..472f5b9c3 100644 --- a/Net/testsuite/src/NetCoreTestSuite.cpp +++ b/Net/testsuite/src/NetCoreTestSuite.cpp @@ -1,7 +1,7 @@ // // NetCoreTestSuite.cpp // -// $Id: //poco/1.3/Net/testsuite/src/NetCoreTestSuite.cpp#1 $ +// $Id: //poco/Main/Net/testsuite/src/NetCoreTestSuite.cpp#4 $ // // Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH. // and Contributors. diff --git a/Net/testsuite/src/NetCoreTestSuite.h b/Net/testsuite/src/NetCoreTestSuite.h index 7bdaf1f40..36f1723b7 100644 --- a/Net/testsuite/src/NetCoreTestSuite.h +++ b/Net/testsuite/src/NetCoreTestSuite.h @@ -1,7 +1,7 @@ // // NetCoreTestSuite.h // -// $Id: //poco/1.3/Net/testsuite/src/NetCoreTestSuite.h#1 $ +// $Id: //poco/Main/Net/testsuite/src/NetCoreTestSuite.h#4 $ // // Definition of the NetCoreTestSuite class. // diff --git a/Net/testsuite/src/NetTestSuite.cpp b/Net/testsuite/src/NetTestSuite.cpp index 2d3f01d42..fe8f1cc10 100644 --- a/Net/testsuite/src/NetTestSuite.cpp +++ b/Net/testsuite/src/NetTestSuite.cpp @@ -1,7 +1,7 @@ // // NetTestSuite.cpp // -// $Id: //poco/1.3/Net/testsuite/src/NetTestSuite.cpp#1 $ +// $Id: //poco/Main/Net/testsuite/src/NetTestSuite.cpp#14 $ // // Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH. // and Contributors. diff --git a/Net/testsuite/src/NetTestSuite.h b/Net/testsuite/src/NetTestSuite.h index 674ebd9d0..a7a389c53 100644 --- a/Net/testsuite/src/NetTestSuite.h +++ b/Net/testsuite/src/NetTestSuite.h @@ -1,7 +1,7 @@ // // NetTestSuite.h // -// $Id: //poco/1.3/Net/testsuite/src/NetTestSuite.h#1 $ +// $Id: //poco/Main/Net/testsuite/src/NetTestSuite.h#4 $ // // Definition of the NetTestSuite class. // diff --git a/Net/testsuite/src/NetworkInterfaceTest.cpp b/Net/testsuite/src/NetworkInterfaceTest.cpp index 17fe718a0..4c875d41b 100644 --- a/Net/testsuite/src/NetworkInterfaceTest.cpp +++ b/Net/testsuite/src/NetworkInterfaceTest.cpp @@ -1,7 +1,7 @@ // // NetworkInterfaceTest.cpp // -// $Id: //poco/1.3/Net/testsuite/src/NetworkInterfaceTest.cpp#1 $ +// $Id: //poco/Main/Net/testsuite/src/NetworkInterfaceTest.cpp#5 $ // // Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH. // and Contributors. diff --git a/Net/testsuite/src/NetworkInterfaceTest.h b/Net/testsuite/src/NetworkInterfaceTest.h index a3284254e..875fb43f1 100644 --- a/Net/testsuite/src/NetworkInterfaceTest.h +++ b/Net/testsuite/src/NetworkInterfaceTest.h @@ -1,7 +1,7 @@ // // NetworkInterfaceTest.h // -// $Id: //poco/1.3/Net/testsuite/src/NetworkInterfaceTest.h#1 $ +// $Id: //poco/Main/Net/testsuite/src/NetworkInterfaceTest.h#4 $ // // Definition of the NetworkInterfaceTest class. // diff --git a/Net/testsuite/src/POP3ClientSessionTest.cpp b/Net/testsuite/src/POP3ClientSessionTest.cpp index 58ce97578..b05c08542 100644 --- a/Net/testsuite/src/POP3ClientSessionTest.cpp +++ b/Net/testsuite/src/POP3ClientSessionTest.cpp @@ -1,7 +1,7 @@ // // POP3ClientSessionTest.cpp // -// $Id: //poco/1.3/Net/testsuite/src/POP3ClientSessionTest.cpp#1 $ +// $Id: //poco/Main/Net/testsuite/src/POP3ClientSessionTest.cpp#6 $ // // Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH. // and Contributors. diff --git a/Net/testsuite/src/POP3ClientSessionTest.h b/Net/testsuite/src/POP3ClientSessionTest.h index d7a1f2c43..011ec5a12 100644 --- a/Net/testsuite/src/POP3ClientSessionTest.h +++ b/Net/testsuite/src/POP3ClientSessionTest.h @@ -1,7 +1,7 @@ // // POP3ClientSessionTest.h // -// $Id: //poco/1.3/Net/testsuite/src/POP3ClientSessionTest.h#1 $ +// $Id: //poco/Main/Net/testsuite/src/POP3ClientSessionTest.h#5 $ // // Definition of the POP3ClientSessionTest class. // diff --git a/Net/testsuite/src/QuotedPrintableTest.cpp b/Net/testsuite/src/QuotedPrintableTest.cpp index f2045ae19..97c82aba5 100644 --- a/Net/testsuite/src/QuotedPrintableTest.cpp +++ b/Net/testsuite/src/QuotedPrintableTest.cpp @@ -1,7 +1,7 @@ // // QuotedPrintableTest.cpp // -// $Id: //poco/1.3/Net/testsuite/src/QuotedPrintableTest.cpp#1 $ +// $Id: //poco/Main/Net/testsuite/src/QuotedPrintableTest.cpp#6 $ // // Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH. // and Contributors. diff --git a/Net/testsuite/src/QuotedPrintableTest.h b/Net/testsuite/src/QuotedPrintableTest.h index a4038482f..27e04a5a7 100644 --- a/Net/testsuite/src/QuotedPrintableTest.h +++ b/Net/testsuite/src/QuotedPrintableTest.h @@ -1,7 +1,7 @@ // // QuotedPrintableTest.h // -// $Id: //poco/1.3/Net/testsuite/src/QuotedPrintableTest.h#1 $ +// $Id: //poco/Main/Net/testsuite/src/QuotedPrintableTest.h#4 $ // // Definition of the QuotedPrintableTest class. // diff --git a/Net/testsuite/src/RawSocketTest.cpp b/Net/testsuite/src/RawSocketTest.cpp index efd1f8acd..3d5d9a9bd 100644 --- a/Net/testsuite/src/RawSocketTest.cpp +++ b/Net/testsuite/src/RawSocketTest.cpp @@ -1,7 +1,7 @@ // // RawSocketTest.cpp // -// $Id: //poco/1.3/Net/testsuite/src/RawSocketTest.cpp#1 $ +// $Id: //poco/Main/Net/testsuite/src/RawSocketTest.cpp#4 $ // // Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH. // and Contributors. diff --git a/Net/testsuite/src/RawSocketTest.h b/Net/testsuite/src/RawSocketTest.h index 341584d97..30908d5f0 100644 --- a/Net/testsuite/src/RawSocketTest.h +++ b/Net/testsuite/src/RawSocketTest.h @@ -1,7 +1,7 @@ // // RawSocketTest.h // -// $Id: //poco/1.3/Net/testsuite/src/RawSocketTest.h#1 $ +// $Id: //poco/Main/Net/testsuite/src/RawSocketTest.h#3 $ // // Definition of the RawSocketTest class. // diff --git a/Net/testsuite/src/ReactorTestSuite.cpp b/Net/testsuite/src/ReactorTestSuite.cpp index 4b1eb9b43..618ccbd36 100644 --- a/Net/testsuite/src/ReactorTestSuite.cpp +++ b/Net/testsuite/src/ReactorTestSuite.cpp @@ -1,7 +1,7 @@ // // ReactorTestSuite.cpp // -// $Id: //poco/1.3/Net/testsuite/src/ReactorTestSuite.cpp#1 $ +// $Id: //poco/Main/Net/testsuite/src/ReactorTestSuite.cpp#4 $ // // Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH. // and Contributors. diff --git a/Net/testsuite/src/ReactorTestSuite.h b/Net/testsuite/src/ReactorTestSuite.h index a4b6738c9..d74061469 100644 --- a/Net/testsuite/src/ReactorTestSuite.h +++ b/Net/testsuite/src/ReactorTestSuite.h @@ -1,7 +1,7 @@ // // ReactorTestSuite.h // -// $Id: //poco/1.3/Net/testsuite/src/ReactorTestSuite.h#1 $ +// $Id: //poco/Main/Net/testsuite/src/ReactorTestSuite.h#4 $ // // Definition of the ReactorTestSuite class. // diff --git a/Net/testsuite/src/SMTPClientSessionTest.cpp b/Net/testsuite/src/SMTPClientSessionTest.cpp index 7a9e2ae54..6c5ce7bdb 100644 --- a/Net/testsuite/src/SMTPClientSessionTest.cpp +++ b/Net/testsuite/src/SMTPClientSessionTest.cpp @@ -1,7 +1,7 @@ // // SMTPClientSessionTest.cpp // -// $Id: //poco/1.3/Net/testsuite/src/SMTPClientSessionTest.cpp#1 $ +// $Id: //poco/Main/Net/testsuite/src/SMTPClientSessionTest.cpp#6 $ // // Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH. // and Contributors. diff --git a/Net/testsuite/src/SMTPClientSessionTest.h b/Net/testsuite/src/SMTPClientSessionTest.h index 7e97a9c59..397986ae4 100644 --- a/Net/testsuite/src/SMTPClientSessionTest.h +++ b/Net/testsuite/src/SMTPClientSessionTest.h @@ -1,7 +1,7 @@ // // SMTPClientSessionTest.h // -// $Id: //poco/1.3/Net/testsuite/src/SMTPClientSessionTest.h#1 $ +// $Id: //poco/Main/Net/testsuite/src/SMTPClientSessionTest.h#4 $ // // Definition of the SMTPClientSessionTest class. // diff --git a/Net/testsuite/src/SocketAddressTest.cpp b/Net/testsuite/src/SocketAddressTest.cpp index be1256748..81a9824f7 100644 --- a/Net/testsuite/src/SocketAddressTest.cpp +++ b/Net/testsuite/src/SocketAddressTest.cpp @@ -1,7 +1,7 @@ // // SocketAddressTest.cpp // -// $Id: //poco/1.3/Net/testsuite/src/SocketAddressTest.cpp#1 $ +// $Id: //poco/Main/Net/testsuite/src/SocketAddressTest.cpp#7 $ // // Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH. // and Contributors. diff --git a/Net/testsuite/src/SocketAddressTest.h b/Net/testsuite/src/SocketAddressTest.h index a56bff0b4..7a3b24309 100644 --- a/Net/testsuite/src/SocketAddressTest.h +++ b/Net/testsuite/src/SocketAddressTest.h @@ -1,7 +1,7 @@ // // SocketAddressTest.h // -// $Id: //poco/1.3/Net/testsuite/src/SocketAddressTest.h#1 $ +// $Id: //poco/Main/Net/testsuite/src/SocketAddressTest.h#4 $ // // Definition of the SocketAddressTest class. // diff --git a/Net/testsuite/src/SocketReactorTest.cpp b/Net/testsuite/src/SocketReactorTest.cpp index bf9a2646d..613359b38 100644 --- a/Net/testsuite/src/SocketReactorTest.cpp +++ b/Net/testsuite/src/SocketReactorTest.cpp @@ -1,7 +1,7 @@ // // SocketReactorTest.cpp // -// $Id: //poco/1.3/Net/testsuite/src/SocketReactorTest.cpp#1 $ +// $Id: //poco/Main/Net/testsuite/src/SocketReactorTest.cpp#9 $ // // Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH. // and Contributors. diff --git a/Net/testsuite/src/SocketReactorTest.h b/Net/testsuite/src/SocketReactorTest.h index 96a06339b..661990bb7 100644 --- a/Net/testsuite/src/SocketReactorTest.h +++ b/Net/testsuite/src/SocketReactorTest.h @@ -1,7 +1,7 @@ // // SocketReactorTest.h // -// $Id: //poco/1.3/Net/testsuite/src/SocketReactorTest.h#1 $ +// $Id: //poco/Main/Net/testsuite/src/SocketReactorTest.h#6 $ // // Definition of the SocketReactorTest class. // diff --git a/Net/testsuite/src/SocketStreamTest.cpp b/Net/testsuite/src/SocketStreamTest.cpp index 281ad52f9..29d6abb24 100644 --- a/Net/testsuite/src/SocketStreamTest.cpp +++ b/Net/testsuite/src/SocketStreamTest.cpp @@ -1,7 +1,7 @@ // // SocketStreamTest.cpp // -// $Id: //poco/1.3/Net/testsuite/src/SocketStreamTest.cpp#1 $ +// $Id: //poco/Main/Net/testsuite/src/SocketStreamTest.cpp#6 $ // // Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH. // and Contributors. diff --git a/Net/testsuite/src/SocketStreamTest.h b/Net/testsuite/src/SocketStreamTest.h index 527c45fa6..622b15516 100644 --- a/Net/testsuite/src/SocketStreamTest.h +++ b/Net/testsuite/src/SocketStreamTest.h @@ -1,7 +1,7 @@ // // SocketStreamTest.h // -// $Id: //poco/1.3/Net/testsuite/src/SocketStreamTest.h#1 $ +// $Id: //poco/Main/Net/testsuite/src/SocketStreamTest.h#4 $ // // Definition of the SocketStreamTest class. // diff --git a/Net/testsuite/src/SocketTest.cpp b/Net/testsuite/src/SocketTest.cpp index 09cf28062..5f66b66bb 100644 --- a/Net/testsuite/src/SocketTest.cpp +++ b/Net/testsuite/src/SocketTest.cpp @@ -1,7 +1,7 @@ // // SocketTest.cpp // -// $Id: //poco/1.3/Net/testsuite/src/SocketTest.cpp#1 $ +// $Id: //poco/Main/Net/testsuite/src/SocketTest.cpp#8 $ // // Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH. // and Contributors. diff --git a/Net/testsuite/src/SocketTest.h b/Net/testsuite/src/SocketTest.h index 65df31866..2cdebe572 100644 --- a/Net/testsuite/src/SocketTest.h +++ b/Net/testsuite/src/SocketTest.h @@ -1,7 +1,7 @@ // // SocketTest.h // -// $Id: //poco/1.3/Net/testsuite/src/SocketTest.h#1 $ +// $Id: //poco/Main/Net/testsuite/src/SocketTest.h#4 $ // // Definition of the SocketTest class. // diff --git a/Net/testsuite/src/SocketsTestSuite.cpp b/Net/testsuite/src/SocketsTestSuite.cpp index e9b799233..e01f95b51 100644 --- a/Net/testsuite/src/SocketsTestSuite.cpp +++ b/Net/testsuite/src/SocketsTestSuite.cpp @@ -1,7 +1,7 @@ // // SocketsTestSuite.cpp // -// $Id: //poco/1.3/Net/testsuite/src/SocketsTestSuite.cpp#1 $ +// $Id: //poco/Main/Net/testsuite/src/SocketsTestSuite.cpp#8 $ // // Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH. // and Contributors. diff --git a/Net/testsuite/src/SocketsTestSuite.h b/Net/testsuite/src/SocketsTestSuite.h index 14d7d3e6c..37acb9575 100644 --- a/Net/testsuite/src/SocketsTestSuite.h +++ b/Net/testsuite/src/SocketsTestSuite.h @@ -1,7 +1,7 @@ // // SocketsTestSuite.h // -// $Id: //poco/1.3/Net/testsuite/src/SocketsTestSuite.h#1 $ +// $Id: //poco/Main/Net/testsuite/src/SocketsTestSuite.h#4 $ // // Definition of the SocketsTestSuite class. // diff --git a/Net/testsuite/src/TCPServerTest.cpp b/Net/testsuite/src/TCPServerTest.cpp index 3dddc7b79..d435c3193 100644 --- a/Net/testsuite/src/TCPServerTest.cpp +++ b/Net/testsuite/src/TCPServerTest.cpp @@ -1,7 +1,7 @@ // // TCPServerTest.cpp // -// $Id: //poco/1.3/Net/testsuite/src/TCPServerTest.cpp#1 $ +// $Id: //poco/Main/Net/testsuite/src/TCPServerTest.cpp#6 $ // // Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH. // and Contributors. diff --git a/Net/testsuite/src/TCPServerTest.h b/Net/testsuite/src/TCPServerTest.h index 9f879e00d..264a865c4 100644 --- a/Net/testsuite/src/TCPServerTest.h +++ b/Net/testsuite/src/TCPServerTest.h @@ -1,7 +1,7 @@ // // TCPServerTest.h // -// $Id: //poco/1.3/Net/testsuite/src/TCPServerTest.h#1 $ +// $Id: //poco/Main/Net/testsuite/src/TCPServerTest.h#4 $ // // Definition of the TCPServerTest class. // diff --git a/Net/testsuite/src/TCPServerTestSuite.cpp b/Net/testsuite/src/TCPServerTestSuite.cpp index 8d9b16963..1c3a9df79 100644 --- a/Net/testsuite/src/TCPServerTestSuite.cpp +++ b/Net/testsuite/src/TCPServerTestSuite.cpp @@ -1,7 +1,7 @@ // // TCPServerTestSuite.cpp // -// $Id: //poco/1.3/Net/testsuite/src/TCPServerTestSuite.cpp#1 $ +// $Id: //poco/Main/Net/testsuite/src/TCPServerTestSuite.cpp#4 $ // // Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH. // and Contributors. diff --git a/Net/testsuite/src/TCPServerTestSuite.h b/Net/testsuite/src/TCPServerTestSuite.h index a432c2a7f..9ddf3624c 100644 --- a/Net/testsuite/src/TCPServerTestSuite.h +++ b/Net/testsuite/src/TCPServerTestSuite.h @@ -1,7 +1,7 @@ // // TCPServerTestSuite.h // -// $Id: //poco/1.3/Net/testsuite/src/TCPServerTestSuite.h#1 $ +// $Id: //poco/Main/Net/testsuite/src/TCPServerTestSuite.h#4 $ // // Definition of the TCPServerTestSuite class. // diff --git a/Net/testsuite/src/UDPEchoServer.cpp b/Net/testsuite/src/UDPEchoServer.cpp index afb0df509..b2fac6f71 100644 --- a/Net/testsuite/src/UDPEchoServer.cpp +++ b/Net/testsuite/src/UDPEchoServer.cpp @@ -1,7 +1,7 @@ // // UDPEchoServer.cpp // -// $Id: //poco/1.3/Net/testsuite/src/UDPEchoServer.cpp#1 $ +// $Id: //poco/Main/Net/testsuite/src/UDPEchoServer.cpp#8 $ // // Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH. // and Contributors. diff --git a/Net/testsuite/src/UDPEchoServer.h b/Net/testsuite/src/UDPEchoServer.h index 14a16b310..d67d6401c 100644 --- a/Net/testsuite/src/UDPEchoServer.h +++ b/Net/testsuite/src/UDPEchoServer.h @@ -1,7 +1,7 @@ // // UDPEchoServer.h // -// $Id: //poco/1.3/Net/testsuite/src/UDPEchoServer.h#1 $ +// $Id: //poco/Main/Net/testsuite/src/UDPEchoServer.h#6 $ // // Definition of the UDPEchoServer class. // diff --git a/Net/testsuite/src/WinDriver.cpp b/Net/testsuite/src/WinDriver.cpp index 18443d8f3..092a464f9 100644 --- a/Net/testsuite/src/WinDriver.cpp +++ b/Net/testsuite/src/WinDriver.cpp @@ -1,7 +1,7 @@ // // WinDriver.cpp // -// $Id: //poco/1.3/Net/testsuite/src/WinDriver.cpp#1 $ +// $Id: //poco/Main/Net/testsuite/src/WinDriver.cpp#4 $ // // Windows test driver for Poco Net. //