Commit 3ae4ca3c authored by jan.koester's avatar jan.koester
Browse files

new version

parent 0fbec3a6

plugins/media/media.cpp

+0 −1
Original line number Diff line number Diff line
@@ -538,7 +538,6 @@ namespace blogi { 
                    curres.setContentLength(_store->getSize(tid,suuid.data()));

                    curres.send(req,nullptr,-1);

                }else{

                    std::cout << "test 404" << std::endl;

                    curres.setVersion(HTTPVERSION(1.1));

                    curres.setState(HTTP404);

                    curres.send(req,nullptr,0);

plugins/navbar/navbar.cpp

+1 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 *******************************************************************************/

#include <iostream>



#include <cstring>

#include <string>
@@ -100,7 +100,6 @@ namespace blogi { 


                int n2 = Args->database[tid]->exec(&sql2,res2);

                for (int ii = 0; ii < n2; ii++) {

                    std::cout << res2[ii][2] <<std::endl;

                    buf << "<li ";

                    if(turl.compare(0,strlen(res2[ii][0]),res2[ii][0]) == 0 )

                        buf << "class=\"active\"";

plugins/nginxfiler/filer.cpp

+3 −2
Original line number Diff line number Diff line
@@ -233,10 +233,11 @@ namespace blogi { 
                cpos=0;



                try{

                    if(strcmp(res.getTransferEncoding(),"chunked")==0){

                    if(res.getTransferEncoding() &&

                        strcmp(res.getTransferEncoding(),"chunked")==0){

                        chunked=true;

                    }else{

                        throw;

                        throw "e";

                    }

                }catch(...){

                    rlen=res.getContentLength();

plugins/template/template.cpp

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ namespace blogi { 
            Args->database[0]->exec(&sql,res);

        };



        void Rendering(const int tid,libhttppp::HttpRequest *req,libhtmlpp::HtmlElement* curpage,int type){

        void Rendering(const int tid,libhttppp::HttpRequest *req,libhtmlpp::HtmlElement* curpage,int type,const char *sessionid=nullptr){



            blogi::SQL sql;

            blogi::DBResult res;

src/blogi.cpp

+4 −3
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ void blogi::Blogi::loginPage(libhttppp::HttpRequest *curreq,const int tid,const 


void blogi::Blogi::logoutPage(libhttppp::HttpRequest *curreq,const int tid,const char *sessiondid){

    const char *host;

    for(libhttppp::HttpHeader::HeaderData *preq = curreq->getfirstHeaderData(); preq; preq=curreq->nextHeaderData(preq)){

    for(libhttppp::HttpHeader::HeaderData *preq = curreq->getfirstHeaderData(); preq; preq=preq->nextHeaderData()){

        if(strncmp(preq->getkey(),"Host",4)==0)

            host=preq->at(0).getvalue().c_str();

    }
@@ -317,6 +317,7 @@ void blogi::Blogi::RequestEvent(libhttppp::HttpRequest *curreq,const int tid,ULO 
                std::cout << cval->getvalue() << " ";

            }

        }

        if(hip || useragent)

            std::cout << std::endl;



RETRY_REQUEST:
@@ -359,7 +360,7 @@ RETRY_REQUEST: 
            }else{

                char buf[255];

                sessid=sess.createSession(buf,curreq->getHeaderData("user-agent")->at(0).getvalue().c_str());

                cookie.setcookie(&curres, "sessionid", sessid,nullptr,PlgArgs->config->getCookieDomain() ,-1,"/",false,"1","Lax");

                cookie.setcookie(&curres, "sessionid", sessid,nullptr,PlgArgs->config->getCookieDomain() ,(1000*60*60*1),"/",false,"1","Lax",false);

                curres.setState(HTTP307);

                curres.setVersion(HTTPVERSION(1.1));

                curres.setHeaderData("Location")->push_back(curreq->getRequest());