Skip to content

Commit d615c47

Browse files
obiltschnigobiltschnig
committed
integrated changes fro mmain repository
1 parent 4a68362 commit d615c47

8 files changed

Lines changed: 17 additions & 16 deletions

File tree

‎Foundation/src/Format.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//
22
// Format.cpp
33
//
4-
// $Id: //poco/1.3/Foundation/src/Format.cpp#3 $
4+
// $Id: //poco/1.3/Foundation/src/Format.cpp#4 $
55
//
66
// Library: Foundation
77
// Package: Core
@@ -79,7 +79,7 @@ namespace
7979
void parseWidth(std::ostream& str, std::string::const_iterator& itFmt, const std::string::const_iterator& endFmt)
8080
{
8181
int width = 0;
82-
while (itFmt != endFmt && isdigit(*itFmt))
82+
while (itFmt != endFmt && std::isdigit(*itFmt))
8383
{
8484
width = 10*width + *itFmt - '0';
8585
++itFmt;
@@ -94,7 +94,7 @@ namespace
9494
{
9595
++itFmt;
9696
int prec = 0;
97-
while (itFmt != endFmt && isdigit(*itFmt))
97+
while (itFmt != endFmt && std::isdigit(*itFmt))
9898
{
9999
prec = 10*prec + *itFmt - '0';
100100
++itFmt;

‎NetSSL_OpenSSL/samples/HTTPSTimeServer/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
include $(POCO_BASE)/build/rules/global
1010

11-
SYSLIBS += -lssl -lcrypto -ldl
11+
SYSLIBS += -lssl -lcrypto
1212

1313
objects = HTTPSTimeServer
1414

‎NetSSL_OpenSSL/samples/download/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
include $(POCO_BASE)/build/rules/global
1010

11-
SYSLIBS += -lssl -lcrypto -ldl
11+
SYSLIBS += -lssl -lcrypto
1212

1313
objects = download
1414

‎NetSSL_OpenSSL/src/HTTPSClientSession.cpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//
22
// HTTPSClientSession.cpp
33
//
4-
// $Id: //poco/1.3/NetSSL_OpenSSL/src/HTTPSClientSession.cpp#1 $
4+
// $Id: //poco/1.3/NetSSL_OpenSSL/src/HTTPSClientSession.cpp#2 $
55
//
66
// Library: NetSSL_OpenSSL
77
// Package: HTTPSClient
@@ -91,7 +91,8 @@ std::ostream& HTTPSClientSession::sendRequest(HTTPRequest& request)
9191
close();
9292
if (!connected())
9393
reconnect();
94-
request.setKeepAlive(keepAlive);
94+
if (!keepAlive)
95+
request.setKeepAlive(false);
9596
request.setHost(getHost(), getPort());
9697

9798
{

‎NetSSL_OpenSSL/testsuite/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
include $(POCO_BASE)/build/rules/global
1010

11-
SYSLIBS += -lssl -lcrypto -ldl
11+
SYSLIBS += -lssl -lcrypto
1212

1313
objects = NetSSLTestSuite Driver \
1414
HTTPSClientSessionTest HTTPSClientTestSuite HTTPSServerTest HTTPSServerTestSuite \

‎NetSSL_OpenSSL/testsuite/src/HTTPSServerTest.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//
22
// HTTPSServerTest.cpp
33
//
4-
// $Id: //poco/1.3/NetSSL_OpenSSL/testsuite/src/HTTPSServerTest.cpp#1 $
4+
// $Id: //poco/1.3/NetSSL_OpenSSL/testsuite/src/HTTPSServerTest.cpp#2 $
55
//
66
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
77
// and Contributors.
@@ -226,7 +226,7 @@ void HTTPSServerTest::testIdentityRequestKeepAlive()
226226
HTTPSClientSession cs("localhost", svs.address().port());
227227
cs.setKeepAlive(true);
228228
std::string body(5000, 'x');
229-
HTTPRequest request("POST", "/echoBody");
229+
HTTPRequest request("POST", "/echoBody", HTTPMessage::HTTP_1_1);
230230
request.setContentLength((int) body.length());
231231
request.setContentType("text/plain");
232232
cs.sendRequest(request) << body;
@@ -240,7 +240,7 @@ void HTTPSServerTest::testIdentityRequestKeepAlive()
240240

241241
body.assign(1000, 'y');
242242
request.setContentLength((int) body.length());
243-
cs.setKeepAlive(false);
243+
request.setKeepAlive(false);
244244
cs.sendRequest(request) << body;
245245
cs.receiveResponse(response) >> rbody;
246246
assert (response.getContentLength() == body.size());
@@ -260,7 +260,7 @@ void HTTPSServerTest::testChunkedRequestKeepAlive()
260260
HTTPSClientSession cs("localhost", svs.address().port());
261261
cs.setKeepAlive(true);
262262
std::string body(5000, 'x');
263-
HTTPRequest request("POST", "/echoBody");
263+
HTTPRequest request("POST", "/echoBody", HTTPMessage::HTTP_1_1);
264264
request.setContentType("text/plain");
265265
request.setChunkedTransferEncoding(true);
266266
cs.sendRequest(request) << body;
@@ -273,7 +273,7 @@ void HTTPSServerTest::testChunkedRequestKeepAlive()
273273
assert (rbody == body);
274274

275275
body.assign(1000, 'y');
276-
cs.setKeepAlive(false);
276+
request.setKeepAlive(false);
277277
cs.sendRequest(request) << body;
278278
cs.receiveResponse(response) >> rbody;
279279
assert (response.getContentLength() == HTTPMessage::UNKNOWN_CONTENT_LENGTH);

‎NetSSL_OpenSSL/testsuite/src/HTTPSTestServer.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//
22
// HTTPSTestServer.cpp
33
//
4-
// $Id: //poco/1.3/NetSSL_OpenSSL/testsuite/src/HTTPSTestServer.cpp#1 $
4+
// $Id: //poco/1.3/NetSSL_OpenSSL/testsuite/src/HTTPSTestServer.cpp#2 $
55
//
66
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
77
// and Contributors.
@@ -201,7 +201,7 @@ std::string HTTPSTestServer::handleRequest() const
201201
response.append(NumberFormatter::formatHex((unsigned) body.length()));
202202
response.append("\r\n");
203203
response.append(body);
204-
response.append("\r\n0\r\n");
204+
response.append("\r\n0\r\n\r\n");
205205
response.append("HTTP/1.1 200 OK\r\n");
206206
response.append("Connection: close\r\n");
207207
response.append("Content-Type: text/plain\r\n");

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.3-20070104-ssl (2007-01-04)
1+
1.3-20070104 (2007-01-04)

0 commit comments

Comments
 (0)