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

using PT::IsSubString* methods from pikotools

Browse Source 
git-svn-id: svn://ttmath.org/publicrep/winix/trunk@1138 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
Tomasz Sowa
2018-11-01 00:46:44 +00:00
parent 8f6004d444
commit 919c2f62f5
26 changed files with 272 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files
winixd/core/Makefile.dep
+22 -8
View File
@@ -47,7 +47,8 @@ app.o: ../../../winix/winixd/templates/localefilter.h ../../../ezc/src/ezc.h
app.o: ../../../ezc/src/generator.h ../../../ezc/src/blocks.h
app.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h
app.o: ../../../ezc/src/funinfo.h ../../../ezc/src/objects.h
app.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h
app.o: ../../../ezc/src/pattern.h ../../../ezc/src/expressionparser.h
app.o: ../../../ezc/src/patternparser.h
app.o: ../../../winix/winixd/notify/notifythread.h
app.o: ../../../winix/winixd/core/basethread.h
app.o: ../../../winix/winixd/notify/templatesnotify.h
@@ -112,8 +113,9 @@ app.o: ../../../winix/winixd/templates/patterns.h
app.o: ../../../winix/winixd/templates/changepatterns.h
app.o: ../../../winix/winixd/templates/htmltextstream.h
app.o: ../../../winix/winixd/core/sessionmanager.h compress.h postparser.h
app.o: httpsimpleparser.h plugin.h pluginmsg.h cookieparser.h
app.o: postmultiparser.h acceptencodingparser.h acceptbaseparser.h
app.o: httpsimpleparser.h plugin.h pluginmsg.h
app.o: ../../../pikotools/convert/text.h cookieparser.h postmultiparser.h
app.o: acceptencodingparser.h acceptbaseparser.h
app.o: ../../../pikotools/space/jsontospaceparser.h
basethread.o: basethread.h synchro.h
bbcodeparser.o: bbcodeparser.h htmlfilter.h
@@ -176,6 +178,7 @@ config.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
config.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h
config.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
config.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h
config.o: ../../../ezc/src/expressionparser.h
config.o: ../../../ezc/src/patternparser.h
config.o: ../../../winix/winixd/notify/notifythread.h
config.o: ../../../winix/winixd/core/basethread.h
@@ -314,7 +317,8 @@ dirs.o: ../../../winix/winixd/templates/localefilter.h ../../../ezc/src/ezc.h
dirs.o: ../../../ezc/src/generator.h ../../../ezc/src/blocks.h
dirs.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h
dirs.o: ../../../ezc/src/funinfo.h ../../../ezc/src/objects.h
dirs.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h
dirs.o: ../../../ezc/src/pattern.h ../../../ezc/src/expressionparser.h
dirs.o: ../../../ezc/src/patternparser.h
dirs.o: ../../../winix/winixd/notify/notifythread.h
dirs.o: ../../../winix/winixd/core/basethread.h
dirs.o: ../../../winix/winixd/notify/templatesnotify.h
@@ -400,7 +404,7 @@ image.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
image.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h
image.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
image.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h
image.o: ../../../ezc/src/patternparser.h
image.o: ../../../ezc/src/expressionparser.h ../../../ezc/src/patternparser.h
image.o: ../../../winix/winixd/notify/notifythread.h
image.o: ../../../winix/winixd/core/basethread.h
image.o: ../../../winix/winixd/notify/templatesnotify.h
@@ -534,7 +538,8 @@ job.o: ../../../winix/winixd/templates/localefilter.h ../../../ezc/src/ezc.h
job.o: ../../../ezc/src/generator.h ../../../ezc/src/blocks.h
job.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h
job.o: ../../../ezc/src/funinfo.h ../../../ezc/src/objects.h
job.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h
job.o: ../../../ezc/src/pattern.h ../../../ezc/src/expressionparser.h
job.o: ../../../ezc/src/patternparser.h
job.o: ../../../winix/winixd/notify/notifythread.h
job.o: ../../../winix/winixd/core/basethread.h
job.o: ../../../winix/winixd/notify/templatesnotify.h
@@ -677,7 +682,8 @@ misc.o: ../../../winix/winixd/templates/templates.h ../../../ezc/src/ezc.h
misc.o: ../../../ezc/src/generator.h ../../../ezc/src/blocks.h
misc.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h
misc.o: ../../../ezc/src/funinfo.h ../../../ezc/src/objects.h
misc.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h
misc.o: ../../../ezc/src/pattern.h ../../../ezc/src/expressionparser.h
misc.o: ../../../ezc/src/patternparser.h
misc.o: ../../../winix/winixd/templates/patterncacher.h
misc.o: ../../../winix/winixd/core/item.h
misc.o: ../../../winix/winixd/templates/indexpatterns.h
@@ -748,6 +754,7 @@ mountparser.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
mountparser.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h
mountparser.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
mountparser.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h
mountparser.o: ../../../ezc/src/expressionparser.h
mountparser.o: ../../../ezc/src/patternparser.h
mountparser.o: ../../../winix/winixd/notify/notifythread.h
mountparser.o: ../../../winix/winixd/core/basethread.h
@@ -794,6 +801,7 @@ mounts.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
mounts.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h
mounts.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
mounts.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h
mounts.o: ../../../ezc/src/expressionparser.h
mounts.o: ../../../ezc/src/patternparser.h
mounts.o: ../../../winix/winixd/notify/notifythread.h
mounts.o: ../../../winix/winixd/core/basethread.h
@@ -900,6 +908,7 @@ plugin.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
plugin.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h
plugin.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
plugin.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h
plugin.o: ../../../ezc/src/expressionparser.h
plugin.o: ../../../ezc/src/patternparser.h
plugin.o: ../../../winix/winixd/notify/notifythread.h
plugin.o: ../../../winix/winixd/core/basethread.h
@@ -1006,6 +1015,7 @@ plugindata.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
plugindata.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h
plugindata.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
plugindata.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h
plugindata.o: ../../../ezc/src/expressionparser.h
plugindata.o: ../../../ezc/src/patternparser.h
plugindata.o: ../../../winix/winixd/notify/notifythread.h
plugindata.o: ../../../winix/winixd/core/basethread.h
@@ -1094,6 +1104,7 @@ postmultiparser.o: ../../../pikotools/space/spacetojson.h
postmultiparser.o: ../../../ezc/src/outstreams.h session.h user.h
postmultiparser.o: plugindata.h rebus.h ipban.h mount.h
postmultiparser.o: ../../../winix/winixd/templates/locale.h
postmultiparser.o: ../../../pikotools/convert/text.h
rebus.o: log.h textstream.h logmanipulators.h
rebus.o: ../../../pikotools/textstream/textstream.h
rebus.o: ../../../pikotools/space/space.h
@@ -1153,6 +1164,7 @@ request.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
request.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h
request.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
request.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h
request.o: ../../../ezc/src/expressionparser.h
request.o: ../../../ezc/src/patternparser.h
request.o: ../../../winix/winixd/notify/notifythread.h
request.o: ../../../winix/winixd/core/basethread.h
@@ -1336,6 +1348,7 @@ sessionmanager.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
sessionmanager.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h
sessionmanager.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
sessionmanager.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h
sessionmanager.o: ../../../ezc/src/expressionparser.h
sessionmanager.o: ../../../ezc/src/patternparser.h
sessionmanager.o: ../../../winix/winixd/notify/notifythread.h
sessionmanager.o: ../../../winix/winixd/core/basethread.h
@@ -1482,6 +1495,7 @@ system.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
system.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h
system.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
system.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h
system.o: ../../../ezc/src/expressionparser.h
system.o: ../../../ezc/src/patternparser.h
system.o: ../../../winix/winixd/notify/notifythread.h
system.o: ../../../winix/winixd/core/basethread.h
@@ -1638,7 +1652,7 @@ users.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
users.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h
users.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
users.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h
users.o: ../../../ezc/src/patternparser.h
users.o: ../../../ezc/src/expressionparser.h ../../../ezc/src/patternparser.h
users.o: ../../../winix/winixd/notify/notifythread.h
users.o: ../../../winix/winixd/core/basethread.h
users.o: ../../../winix/winixd/notify/templatesnotify.h
winixd/core/app.cpp
+4 -4
View File
@@ -825,12 +825,12 @@ void App::ReadEnvHTTPVariables()
{
char * env = *e;
if( IsSubStringNoCasep("HTTP_", env) )
if( PT::IsSubStringNoCasep("HTTP_", env) )
{
env += http_prefix_len;
// cookies we have in a different table
if( !IsSubStringNoCasep("COOKIE=", env) )
if( !PT::IsSubStringNoCasep("COOKIE=", env) )
{
if( SaveEnvHTTPVariable(env) )
{
@@ -1030,13 +1030,13 @@ void App::ReadPostVars()
if( cur.request->method == Request::post || cur.request->method == Request::delete_ )
{
if( IsSubStringNoCase(L"multipart/form-data", cur.request->env_content_type.c_str()) )
if( PT::IsSubStringNoCase(L"multipart/form-data", cur.request->env_content_type.c_str()) )
{
log << log3 << "App: post content type: multipart/form-data" << logend;
post_multi_parser.Parse(fcgi_request.in, cur.request->post_tab, cur.request->post_file_tab);
}
else
if( IsSubStringNoCase(L"application/json", cur.request->env_content_type.c_str()) )
if( PT::IsSubStringNoCase(L"application/json", cur.request->env_content_type.c_str()) )
{
log << log3 << "App: post content type: application/json" << logend;
ReadPostJson();
winixd/core/misc.h
+2 -1
View File
@@ -45,6 +45,7 @@
#include "textstream/textstream.h"
#include "utf8/utf8.h"
#include "winix_const.h"
#include "convert/convert.h"
@@ -419,7 +420,7 @@ size_t i = 0;
while( i < buf.size() )
{
if( IsSubString(look_for.c_str(), buf.c_str() + i) )
if( PT::IsSubString(look_for.c_str(), buf.c_str() + i) )
{
buf.erase(i, look_for.size());
buf.insert(i, replace);
winixd/core/postmultiparser.cpp
+3 -2
View File
@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2008-2014, Tomasz Sowa
* Copyright (c) 2008-2018, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -37,6 +37,7 @@
#include "postmultiparser.h"
#include "log.h"
#include "utf8/utf8.h"
#include "convert/text.h"
@@ -381,7 +382,7 @@ void PostMultiParser::ReadContent()
log << log2 << "PMP: content size: " << content_len << " bytes" << logend;
if( !IsSubStringNoCase("pass", name.c_str()) )
if( !PT::IsSubStringNoCase("pass", name.c_str()) )
LogFirst(content, config->log_post_value_size);
}
winixd/core/postparser.h
+3 -2
View File
@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2008-2014, Tomasz Sowa
* Copyright (c) 2008-2018, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -43,6 +43,7 @@
#include "utf8/utf8.h"
#include "log.h"
#include "plugin.h"
#include "convert/text.h"
namespace Winix
@@ -78,7 +79,7 @@ protected:
{
log << log2 << "Method POST, name: \"" << name << "\"";
if( log_value_size > 0 && !IsSubStringNoCase(L"pass", name.c_str()) )
if( log_value_size > 0 && !PT::IsSubStringNoCase(L"pass", name.c_str()) )
{
log << ", value: ";