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

test

parent c629c80a

src/CMakeLists.txt

+3 −1
Original line number Diff line number Diff line
@@ -70,8 +70,10 @@ export(EXPORT httpppTargets 
  NAMESPACE httppp::

)



configure_file(cmake/httpppConfig.cmake

configure_package_config_file(

  "${CMAKE_CURRENT_SOURCE_DIR}/cmake/httpppConfig.cmake"

  "${CMAKE_CURRENT_BINARY_DIR}/httppp/libhttpppConfig.cmake"

     INSTALL_DESTINATION ${ConfigPackageLocation}

  @ONLY

)

src/cmake/httpppConfig.cmake

+6 −12
Original line number Diff line number Diff line 
include("${CMAKE_CURRENT_LIST_DIR}/libhttpppTargets.cmake")



get_filename_component(httppp_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)

if(EXISTS "${httppp_CMAKE_DIR}/CMakeCache.txt")

  # In build tree

  include("${httppp_CMAKE_DIR}/httpppBuildTreeSettings.cmake")

else()

  set(httppp_INCLUDE_DIRS "@CMAKE_INSTALL_PREFIX@/include/httppp")

endif()



set(httppp_LIBRARIES httppp)

set(httppp_INCLUDE_DIR "httppp")

include(CMakeFindDependencyMacro)

# find_dependency(xx 2.0)

include(${CMAKE_CURRENT_LIST_DIR}/libhttpppTargets.cmake)

include(${CMAKE_CURRENT_LIST_DIR}/libhttpppConfigVersion.cmake)



set(HTTPPP_INCLUDE_DIR   "@CMAKE_INSTALL_PREFIX@/include" )

set(HTTPPP_CONFIG_DIR    "@CMAKE_INSTALL_PREFIX@/@ConfigPackageLocation@" )
 
 No newline at end of file

src/httpd.cpp

+2 −3
Original line number Diff line number Diff line
@@ -42,7 +42,8 @@ 
#define MAXDEFAULTCONN 1024

#define MBEDTLS_PSA_CRYPTO_CONFIG true



libhttppp::HttpEvent::HttpEvent(netplus::socket *csock) : netplus::event(csock){

libhttppp::HttpEvent::HttpEvent(netplus::socket* csock) : event(csock){



}



void libhttppp::HttpEvent::CreateConnetion(netplus::con ** curon){
@@ -123,8 +124,6 @@ void libhttppp::HttpEvent::DisconnectEvent(netplus::con* curcon,const int tid,UL 
    DisconnectEvent((HttpRequest*)curcon,tid,args);

}







libhttppp::HttpD::HttpD(int argc, char** argv) {

    _fileServer = false;

    _ServerSocket = nullptr;