generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-28 11:31:53 +01:00
Code Issues Projects Releases Wiki Activity

ifdef auto_ptr

Browse Source
This commit is contained in:
Alex Fabijanic
2017-10-24 21:55:33 -05:00
parent 87ec631b4a
commit 1a18621ff8
17 changed files with 130 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ApacheConnector/src/ApacheConnector.cpp
View File

@@ -170,8 +170,9 @@ extern "C" int ApacheConnector_handler(request_rec *r)
apr_status_t rv;
if ((rv = ap_setup_client_block(r, REQUEST_CHUNKED_DECHUNK)))
return rv;
return rv;
#ifndef POCO_ENABLE_CPP11
std::auto_ptr<ApacheServerRequest> pRequest(new ApacheServerRequest(
&rec,
r->connection->local_ip,
@@ -180,13 +181,28 @@ extern "C" int ApacheConnector_handler(request_rec *r)
r->connection->remote_addr->port));
std::auto_ptr<ApacheServerResponse> pResponse(new ApacheServerResponse(pRequest.get()));
#else
std::unique_ptr<ApacheServerRequest> pRequest(new ApacheServerRequest(
&rec,
r->connection->local_ip,
r->connection->local_addr->port,
r->connection->remote_ip,
r->connection->remote_addr->port));
std::unique_ptr<ApacheServerResponse> pResponse(new ApacheServerResponse(pRequest.get()));
#endif // POCO_ENABLE_CPP11
// add header information to request
rec.copyHeaders(*pRequest);
try
{
#ifndef POCO_ENABLE_CPP11
std::auto_ptr<HTTPRequestHandler> pHandler(app.factory().createRequestHandler(*pRequest));
#else
std::unique_ptr<HTTPRequestHandler> pHandler(app.factory().createRequestHandler(*pRequest));
#endif // POCO_ENABLE_CPP11
if (pHandler.get())
{