Commit b01aa616 authored by jan.koester's avatar jan.koester
Browse files

test

parent bc1ed6cf
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -1680,12 +1680,12 @@ libhttppp::HttpD::HttpD(int argc, char** argv) {
    }
}

libhttppp::HttpD::HttpD(const std::string& httpaddr, int port,int maxconnections,const  std::string &sslcertpath,const  std::string &sslkeypath) {
libhttppp::HttpD::HttpD(const std::string& httpaddr, int port,int maxconnections,const  std::string &sslcertpath,const  std::string &sslkeypath, const std::string &sslpassword) {
    try {
		_fileServer = false;
        if (!sslcertpath.empty()) {
                netplus::ssl::CertificateBundle bundle;
                if (!bundle.loadFromFile(sslcertpath, sslkeypath)) {
                if (!bundle.loadFromFile(sslcertpath, sslkeypath, sslpassword)) {
                    _httpexception[HTTPException::Critical] << "failed to load cert/key: " << sslcertpath;
                    throw _httpexception;
                }
+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ namespace libhttppp {
    class HttpD {
    public:
        HttpD(int argc, char** argv);
        HttpD(const std::string &httpaddr, int port, int maxconnections, const std::string &sslcertpath, const  std::string &sslkeypath);
        HttpD(const std::string &httpaddr, int port, int maxconnections, const std::string &sslcertpath, const  std::string &sslkeypath, const std::string &sslpassword = "");
        ~HttpD();
        std::vector<netplus::socket*> getServerSockets();
    protected: