changes

Author: tmmsunny012

src/HTTPSConnection.cpp

@@ -5,13 +5,10 @@ namespace httpsserver {
 
 HTTPSConnection::HTTPSConnection(ResourceResolver * resResolver):
   HTTPConnection(resResolver) {
-<<<<<<< HEAD
   _sslCtx = NULL;
   _ssl = NULL;
   _TLSTickets = NULL;
-=======
   _ssl = esp_tls_init();
->>>>>>> upstream/pr/169
 }
 
 HTTPSConnection::~HTTPSConnection() {

src/HTTPSConnection.hpp

@@ -36,12 +36,9 @@ class HTTPSConnection : public HTTPConnection {
   HTTPSConnection(ResourceResolver * resResolver);
   virtual ~HTTPSConnection();
 
-<<<<<<< HEAD
   virtual void initialize(int serverSocketID, HTTPHeaders *defaultHeaders, SSL_CTX * sslCtx, TLSTickets * tickets);
   virtual int fullyAccept() override; 
-=======
   virtual int initialize(int serverSocketID,esp_tls_cfg_server_t * cfgSrv, HTTPHeaders *defaultHeaders);
->>>>>>> upstream/pr/169
   virtual void closeConnection();
   virtual bool isSecure();
 
@@ -56,15 +53,12 @@ class HTTPSConnection : public HTTPConnection {
 
 private:
   // SSL context for this connection
-<<<<<<< HEAD
   SSL_CTX * _sslCtx;
   SSL * _ssl;
 	TLSTickets * _TLSTickets;
 
-=======
   esp_tls_t * _ssl;
   esp_tls_cfg_server_t * _cfg;
->>>>>>> upstream/pr/169
 };
 
 } /* namespace httpsserver */

src/HTTPSServer.cpp

@@ -9,7 +9,6 @@ HTTPSServer::HTTPSServer(SSLCert * cert, const uint16_t port, const uint8_t maxC
   HTTPServer(port, maxConnections, bindAddress),
   _cert(cert) {
   // Configure runtime data
-<<<<<<< HEAD
   _sslctx = NULL;
   _TLSTickets = NULL;
 }
@@ -21,7 +20,6 @@ HTTPSServer::HTTPSServer(SSLCert * cert, const uint16_t port, const uint8_t maxC
 
   // Configure runtime data
   _sslctx = NULL;
-=======
   _cfg = new esp_tls_cfg_server();
   _cfg->alpn_protos = (const char **)alpn_protos;
   _cfg->cacert_buf = NULL;
@@ -30,7 +28,6 @@ HTTPSServer::HTTPSServer(SSLCert * cert, const uint16_t port, const uint8_t maxC
   _cfg->servercert_bytes = cert->getCertLength();
   _cfg->serverkey_buf= cert->getPKData();
   _cfg->serverkey_bytes= cert->getPKLength();
->>>>>>> upstream/pr/169
 }
 
 HTTPSServer::~HTTPSServer() {

src/HTTPSServer.hpp

@@ -34,28 +34,22 @@ class HTTPSServer : public HTTPServer {
   HTTPSServer(SSLCert * cert, const uint16_t portHTTPS = 443, const uint8_t maxConnections = 4, const in_addr_t bindAddress = INADDR_ANY);
   HTTPSServer(SSLCert * cert, const uint16_t portHTTPS, const uint8_t maxConnections, const uint8_t bindAddress[16], const bool ipv6Only);
   virtual ~HTTPSServer();
-<<<<<<< HEAD
 
   // RFC 5077 TLS session tickets
   void enableTLSTickets(uint32_t liftimeSeconds = 86400, bool useHardwareRNG = false);
 
   virtual HTTPSConnection * createConnection() override;
 
-=======
   virtual esp_tls_cfg_server_t *getConfig() {return _cfg;}
->>>>>>> upstream/pr/169
 private:
   // Static configuration. Port, keys, etc. ====================
   // Certificate that should be used (includes private key)
   SSLCert * _cert;
 
   //// Runtime data ============================================
-<<<<<<< HEAD
   SSL_CTX * _sslctx;
   TLSTickets * _TLSTickets;
-=======
   esp_tls_cfg_server_t * _cfg;
->>>>>>> upstream/pr/169
   // Status of the server: Are we running, or not?
 
   // Setup functions

src/HTTPServer.cpp

@@ -118,7 +118,6 @@ void HTTPServer::stop() {
   if (_running) {
     // Set the flag that the server is stopped
     _running = false;
-<<<<<<< HEAD
 
     // Clean up the connections
     bool hasOpenConnections = true;
@@ -135,7 +134,6 @@ void HTTPServer::stop() {
             _connections[i] = NULL;
           } else {
             hasOpenConnections = true;
-=======
     xSemaphoreTake(_selectMutex, portMAX_DELAY); // We won't be releasing this
 
     if (_connections) {
@@ -156,7 +154,6 @@ void HTTPServer::stop() {
             } else {
               hasOpenConnections = true;
             }
->>>>>>> upstream/pr/52
           }
           xSemaphoreGive(_connectionMutex[i]);
           vSemaphoreDelete(_connectionMutex[i]);

src/ResourceParameters.cpp

@@ -126,17 +126,14 @@ void ResourceParameters::setQueryParameter(std::string const &name, std::string
  * @param value The value is written into this parameter.
  * @return true iff the value could be written.
  */
-<<<<<<< HEAD
 bool ResourceParameters::getPathParameter(size_t const idx, std::string &value) {
   if (idx < _pathParams.size()) {
     value = _pathParams.at(idx);
     return true;
   }
   return false;
-=======
 std::string ResourceParameters::getUrlParameter(size_t idx) {
   return _urlParams.at(idx);
->>>>>>> upstream/pr/54
 }
 
 /**
@@ -151,37 +148,31 @@ std::string ResourceParameters::getUrlParameter(size_t idx) {
  * @param idx Defines the index of the parameter to return, starting with 0.
  * @return the value of the placeholder
  */
-<<<<<<< HEAD
 std::string ResourceParameters::getPathParameter(size_t const idx) {
   if (idx < _pathParams.size()) {
     return _pathParams.at(idx);
   }
   return "";
-=======
 uint16_t ResourceParameters::getUrlParameterInt(size_t idx) {
   return parseInt(getUrlParameter(idx));
->>>>>>> upstream/pr/54
 }
 
 void ResourceParameters::resetPathParameters() {
   _pathParams.clear();
 }
 
-<<<<<<< HEAD
 void ResourceParameters::setPathParameter(size_t idx, std::string const &val) {
   if(idx>=_pathParams.size()) {
     _pathParams.resize(idx + 1);
   }
   _pathParams.at(idx) = val;
-=======
 void ResourceParameters::setUrlParameter(size_t idx, std::string const &val) {
   if(idx>=_urlParams.size()) {
     HTTPS_LOGD("Resizing from %d to %d", _urlParams.size(), idx + 1);
     _urlParams.resize(idx + 1);
   }
   HTTPS_LOGD("Size is now %d, accessing idx %d", _urlParams.size(), idx);
   _urlParams.at(idx) = val;
->>>>>>> upstream/pr/54
 }
 
 } /* namespace httpsserver */

src/ResourceParameters.hpp

@@ -41,18 +41,15 @@ class ResourceParameters {
   bool getPathParameter(size_t const idx, std::string &value);
   std::string getPathParameter(size_t const idx);
 
-<<<<<<< HEAD
 protected:
   friend class ResourceResolver;
   void setQueryParameter(std::string const &name, std::string const &value);
   void resetPathParameters();
   void setPathParameter(size_t idx, std::string const &val);
-=======
   std::string getUrlParameter(size_t idx);
   uint16_t getUrlParameterInt(size_t idx);
   void resetUrlParameters();
   void setUrlParameter(size_t idx, std::string const &val);
->>>>>>> upstream/pr/54
 
 private:
   /** Parameters in the path of the URL, the actual values for asterisk placeholders */

src/ResourceResolver.cpp

@@ -51,7 +51,6 @@ void ResourceResolver::resolveNode(const std::string &method, const std::string
       size_t nextparamIdx = url.find('&', reqparamIdx);
 
       // Get the "name=value" string
-<<<<<<< HEAD
       std::string param = nextparamIdx == std::string::npos ?
          url.substr(reqparamIdx) :
          url.substr(reqparamIdx, nextparamIdx - reqparamIdx);
@@ -69,7 +68,6 @@ void ResourceResolver::resolveNode(const std::string &method, const std::string
 
         // Now we finally have name and value.
         params->setQueryParameter(name, value);
-=======
       std::string param = url.substr(reqparamIdx, nextparamIdx - reqparamIdx);
 
       // Find the position where the string has to be split
@@ -80,7 +78,6 @@ void ResourceResolver::resolveNode(const std::string &method, const std::string
       std::string value = "";
       if (nvSplitIdx != std::string::npos) {
         value = urlDecode(param.substr(nvSplitIdx+1));
->>>>>>> upstream/pr/52
       }
 
       // Update reqparamIdx
@@ -91,14 +88,11 @@ void ResourceResolver::resolveNode(const std::string &method, const std::string
 
 
   // Check whether a resource matches
-<<<<<<< HEAD
 
   for(std::vector<HTTPNode*>::iterator itNode = _nodes->begin(); itNode != _nodes->end(); ++itNode) {
     params->resetPathParameters();
-=======
   for(std::vector<HTTPNode*>::iterator itNode = _nodes->begin(); itNode != _nodes->end(); ++itNode) {
     params->resetUrlParameters();
->>>>>>> upstream/pr/54
     HTTPNode *node = *itNode;
     if (node->_nodeType==nodeType) {
       if (

src/WebsocketHandler.cpp

@@ -1,15 +1,12 @@
 #include "WebsocketHandler.hpp"
-<<<<<<< HEAD
 #ifndef TAG
 #define TAG "ARDUINO"
 #endif
-=======
 
 #ifndef TAG
 static const char *TAG = "WebsocketHandler";
 #endif
 
->>>>>>> upstream/pr/164
 namespace httpsserver {
 
 /**