Commit 5aced618 authored by jan.koester's avatar jan.koester
Browse files

porting to netplus

parent 9692b5a9

.kdev4/libhttppp.kdev4

+2 −10
Changes for .kdev4/libhttppp.kdev4: 2 added lines, 10 removed lines.
Original line number Diff line number Diff line 
[Buildset]

BuildItems=@Variant(\x00\x00\x00\t\x00\x00\x00\x00\x01\x00\x00\x00\x0b\x00\x00\x00\x00\x01\x00\x00\x00\x12\x00l\x00i\x00b\x00h\x00t\x00t\x00p\x00p\x00p)



[CMake]

Build Directory Count=1

Current Build Directory Index-Host System=0



[CMake][CMake Build Directory 0]

Build Directory Path=/home/jan.koester/projects/libhttppp/build

Build Directory Path=/home/jan.koester/Projects/libhttppp/build

Build Type=Debug

CMake Binary=/usr/bin/cmake

CMake Executable=/usr/bin/cmake

Environment Profile=

Extra Arguments=

Install Directory=/usr/local

Install Directory=

Runtime=Host System



[MakeBuilder]

Install As Root=true

Number Of Jobs=4

Su Command=kdesudo



[Project]

VersionControlSupport=kdevgit

CMakeLists.txt

+2 −1
Changes for CMakeLists.txt: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -8,7 +8,8 @@ set (BLOCKSIZE 16384 CACHE STRING "Block size from Network Packages") 


include(CheckIncludeFileCXX)



find_package(systempp REQUIRED)

find_package(libnetplus REQUIRED)

find_package(libcryptplus REQUIRED)



SET(CMAKE_CXX_FLAGS "-fPIC -Wall ")

examples/CMakeLists.txt

+7 −7
Changes for examples/CMakeLists.txt: 7 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -9,17 +9,17 @@ if(BUILD_EXAMPLES AND ${htmlpp_FOUND}) 
        ${htmlpp_INCLUDE_DIRS}

    )

    add_executable (httpcon httpcon.cpp)

    target_link_libraries(httpcon httppp-static htmlpp-static c)

    target_link_libraries(httpcon httppp-static htmlpp-static)

    add_executable (httpform httpform.cpp)

    target_link_libraries(httpform httppp-static htmlpp-static c)

    target_link_libraries(httpform httppp-static htmlpp-static)

    add_executable (httpsysinfo httpsysinfo.cpp)

    target_link_libraries(httpsysinfo httppp-static htmlpp-static c)

    target_link_libraries(httpsysinfo httppp-static htmlpp-static)

    add_executable (httpcookie httpcookie.cpp)

    target_link_libraries(httpcookie httppp-static htmlpp-static c)

    target_link_libraries(httpcookie httppp-static htmlpp-static)

    add_executable (httpauth httpauth.cpp)

    target_link_libraries(httpauth httppp-static htmlpp-static c) 

    target_link_libraries(httpauth httppp-static htmlpp-static)

    add_executable (httpproxy httpproxy.cpp)

    target_link_libraries(httpproxy httppp-static htmlpp-static c)

    target_link_libraries(httpproxy httppp-static htmlpp-static)

    add_executable (httphello httphello.cpp)

    target_link_libraries(httphello httppp-static htmlpp-static c)

    target_link_libraries(httphello httppp-static htmlpp-static)

endif()

src/CMakeLists.txt

+2 −4
Changes for src/CMakeLists.txt: 2 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -7,12 +7,10 @@ set(libhttpSrcs 
  exception.cpp

  http.cpp

  httpd.cpp

#  https.cpp

)



include_directories(

    ${systempp_INCLUDE_DIR}

    ${OPENSSL_INCLUDE_DIR}

)



add_library(httppp        SHARED ${libhttpSrcs} )
@@ -23,8 +21,8 @@ add_library(httppp-static STATIC ${libhttpSrcs} ) 


generate_export_header(httppp)



target_link_libraries(httppp ${OPENSSL_LIBRARIES} systempp) 

target_link_libraries(httppp-static ${OPENSSL_LIBRARIES} systempp )    

target_link_libraries(httppp ${OPENSSL_LIBRARIES} netplus)

target_link_libraries(httppp-static ${OPENSSL_LIBRARIES} netplus )



SET(CMAKE_INSTALL_LIBDIR lib CACHE PATH "Output directory for libraries")

src/exception.cpp

+14 −10
Changes for src/exception.cpp: 14 added lines, 10 removed lines.
Original line number Diff line number Diff line
@@ -27,39 +27,43 @@ 


#include "exception.h"



libhttppp::HTTPException::HTTPException() : sys::SystemException(){

libhttppp::HTTPException::HTTPException() {

    _curCType=HTTPException::Note;

};



libhttppp::HTTPException::HTTPException(const HTTPException &exp) : sys::SystemException(exp){

libhttppp::HTTPException::HTTPException(const HTTPException &exp){

    _curCType=exp._curCType;

    _Msg=exp._Msg;

}



libhttppp::HTTPException::~HTTPException(){

}



int libhttppp::HTTPException::getErrorType(){

    return curCType; 

    return _curCType;

}



const char* libhttppp::HTTPException::what(){

    return sys::SystemException::what();

    return _Msg.c_str();

}



libhttppp::HTTPException& libhttppp::HTTPException::asign(const char *src){

    sys::SystemException::asign(src);

libhttppp::HTTPException& libhttppp::HTTPException::append(const char *src){

    _Msg+=src;

    return *this;   

}



libhttppp::HTTPException& libhttppp::HTTPException::operator[](int errtype){

    curCType=errtype;

    _curCType=errtype;

    return *this;

}



libhttppp::HTTPException& libhttppp::HTTPException::operator<<(const char *src){

    return asign(src);   

    return append(src);

};



libhttppp::HTTPException& libhttppp::HTTPException::operator<<(int src){

    sys::SystemException::operator<<(src);

    return *this;

    char buffer[255];

    snprintf(buffer,255,"%d",src);

    return append(buffer);

}