generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-16 18:56:52 +02:00
Code Issues Projects Releases Wiki Activity

integrated changes fro mmain repository

Browse Source
This commit is contained in:
Guenter Obiltschnig
2007-01-04 16:01:28 +00:00
parent 4a68362f6c
commit d615c47379
8 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
NetSSL_OpenSSL/samples/HTTPSTimeServer/Makefile
View File

@@ -8,7 +8,7 @@
include $(POCO_BASE)/build/rules/global
SYSLIBS += -lssl -lcrypto -ldl
SYSLIBS += -lssl -lcrypto
objects = HTTPSTimeServer

2
NetSSL_OpenSSL/samples/download/Makefile
View File

@@ -8,7 +8,7 @@
include $(POCO_BASE)/build/rules/global
SYSLIBS += -lssl -lcrypto -ldl
SYSLIBS += -lssl -lcrypto
objects = download

5
NetSSL_OpenSSL/src/HTTPSClientSession.cpp
View File

@@ -1,7 +1,7 @@
//
// HTTPSClientSession.cpp
//
// $Id: //poco/1.3/NetSSL_OpenSSL/src/HTTPSClientSession.cpp#1 $
// $Id: //poco/1.3/NetSSL_OpenSSL/src/HTTPSClientSession.cpp#2 $
//
// Library: NetSSL_OpenSSL
// Package: HTTPSClient
@@ -91,7 +91,8 @@ std::ostream& HTTPSClientSession::sendRequest(HTTPRequest& request)
close();
if (!connected())
reconnect();
request.setKeepAlive(keepAlive);
if (!keepAlive)
request.setKeepAlive(false);
request.setHost(getHost(), getPort());
{

2
NetSSL_OpenSSL/testsuite/Makefile
View File

@@ -8,7 +8,7 @@
include $(POCO_BASE)/build/rules/global
SYSLIBS += -lssl -lcrypto -ldl
SYSLIBS += -lssl -lcrypto
objects = NetSSLTestSuite Driver \
HTTPSClientSessionTest HTTPSClientTestSuite HTTPSServerTest HTTPSServerTestSuite \

10
NetSSL_OpenSSL/testsuite/src/HTTPSServerTest.cpp
View File

@@ -1,7 +1,7 @@
//
// HTTPSServerTest.cpp
//
// $Id: //poco/1.3/NetSSL_OpenSSL/testsuite/src/HTTPSServerTest.cpp#1 $
// $Id: //poco/1.3/NetSSL_OpenSSL/testsuite/src/HTTPSServerTest.cpp#2 $
//
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
@@ -226,7 +226,7 @@ void HTTPSServerTest::testIdentityRequestKeepAlive()
HTTPSClientSession cs("localhost", svs.address().port());
cs.setKeepAlive(true);
std::string body(5000, 'x');
HTTPRequest request("POST", "/echoBody");
HTTPRequest request("POST", "/echoBody", HTTPMessage::HTTP_1_1);
request.setContentLength((int) body.length());
request.setContentType("text/plain");
cs.sendRequest(request) << body;
@@ -240,7 +240,7 @@ void HTTPSServerTest::testIdentityRequestKeepAlive()
body.assign(1000, 'y');
request.setContentLength((int) body.length());
cs.setKeepAlive(false);
request.setKeepAlive(false);
cs.sendRequest(request) << body;
cs.receiveResponse(response) >> rbody;
assert (response.getContentLength() == body.size());
@@ -260,7 +260,7 @@ void HTTPSServerTest::testChunkedRequestKeepAlive()
HTTPSClientSession cs("localhost", svs.address().port());
cs.setKeepAlive(true);
std::string body(5000, 'x');
HTTPRequest request("POST", "/echoBody");
HTTPRequest request("POST", "/echoBody", HTTPMessage::HTTP_1_1);
request.setContentType("text/plain");
request.setChunkedTransferEncoding(true);
cs.sendRequest(request) << body;
@@ -273,7 +273,7 @@ void HTTPSServerTest::testChunkedRequestKeepAlive()
assert (rbody == body);
body.assign(1000, 'y');
cs.setKeepAlive(false);
request.setKeepAlive(false);
cs.sendRequest(request) << body;
cs.receiveResponse(response) >> rbody;
assert (response.getContentLength() == HTTPMessage::UNKNOWN_CONTENT_LENGTH);

4
NetSSL_OpenSSL/testsuite/src/HTTPSTestServer.cpp
View File

@@ -1,7 +1,7 @@
//
// HTTPSTestServer.cpp
//
// $Id: //poco/1.3/NetSSL_OpenSSL/testsuite/src/HTTPSTestServer.cpp#1 $
// $Id: //poco/1.3/NetSSL_OpenSSL/testsuite/src/HTTPSTestServer.cpp#2 $
//
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
@@ -201,7 +201,7 @@ std::string HTTPSTestServer::handleRequest() const
response.append(NumberFormatter::formatHex((unsigned) body.length()));
response.append("\r\n");
response.append(body);
response.append("\r\n0\r\n");
response.append("\r\n0\r\n\r\n");
response.append("HTTP/1.1 200 OK\r\n");
response.append("Connection: close\r\n");
response.append("Content-Type: text/plain\r\n");