tomasz.sowa/winix
1
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

now winix is using 'pikotools' (confparser, utf8, mainparser)

Browse Source 
git-svn-id: svn://ttmath.org/publicrep/winix/trunk@792 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
Tomasz Sowa
2012-01-12 02:24:08 +00:00
parent cb33f20a24
commit b2d3ca9543
55 changed files with 1749 additions and 1884 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
core/app.cpp
View File

@@ -2,7 +2,7 @@
* This file is a part of Winix
* and is not publicly distributed
*
* Copyright (c) 2010-2011, Tomasz Sowa
* Copyright (c) 2010-2012, Tomasz Sowa
* All rights reserved.
*
*/
@@ -20,7 +20,7 @@
#include "plugin.h"
#include "misc.h"
#include "functions/functions.h"
#include "utf8.h"
#include "utf8/utf8.h"
@@ -652,8 +652,8 @@ void App::SendHeadersStatic()
return;
}
Ezc::WideToUTF8(config.http_header_send_file, sendh_t);
Ezc::WideToUTF8(config.static_dirs[index], sendh_t2);
PT::WideToUTF8(config.http_header_send_file, sendh_t);
PT::WideToUTF8(config.static_dirs[index], sendh_t2);
if( !SendHeadersStaticCreateResource() )
{
@@ -729,7 +729,7 @@ void App::SendHeadersRedirect()
if( !cur.request->redirect_url_encoded )
UrlEncode(cur.request->redirect_to, cur.request->aredirect_to);
else
Ezc::WideToUTF8(cur.request->redirect_to, cur.request->aredirect_to);
PT::WideToUTF8(cur.request->redirect_to, cur.request->aredirect_to);
FCGX_FPrintF(fcgi_request.out, "Location: %s\r\n", cur.request->aredirect_to.c_str());
log << log2 << "App: redirect to: " << cur.request->aredirect_to << logend;
@@ -738,8 +738,8 @@ void App::SendHeadersRedirect()
void App::SendHeadersSendFile()
{
Ezc::WideToUTF8(config.http_header_send_file, sendfilea);
Ezc::WideToUTF8(cur.request->x_sendfile, sendfile2a);
PT::WideToUTF8(config.http_header_send_file, sendfilea);
PT::WideToUTF8(cur.request->x_sendfile, sendfile2a);
FCGX_FPrintF(fcgi_request.out, "%s: %s\r\n", sendfilea.c_str(), sendfile2a.c_str());
FCGX_PutS("Status: 200 OK\r\n", fcgi_request.out);
@@ -837,7 +837,7 @@ void App::FilterCompressSend(bool compressing, int compress_encoding, const std:
}
if( config.utf8 )
Ezc::WideToUTF8(*source, source_a);
PT::WideToUTF8(*source, source_a);
else
AssignString(*source, source_a);
@@ -1271,8 +1271,8 @@ sigset_t set;
FCGX_ShutdownPending();
// here we don't have to use SSL version so we always use config.url_proto
Ezc::WideToUTF8(app->config.url_proto, app->url_to_fetch_on_exit);
Ezc::WideToUTF8(app->config.base_url, app->url_to_fetch_on_exit, false);
PT::WideToUTF8(app->config.url_proto, app->url_to_fetch_on_exit);
PT::WideToUTF8(app->config.base_url, app->url_to_fetch_on_exit, false);
app->Unlock();
// this thread will hang on this method