kiwix/kiwix-tools
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-tools.git synced 2025-09-23 20:10:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

+ kiwix-serve defalte feature

Browse Source
This commit is contained in:
kelson42 2010-06-22 19:19:15 +00:00
parent 0afe315ed5
commit d2636a68c4
1 changed files with 37 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/server/kiwix-serve.cpp
View File

@ -18,6 +18,7 @@
#include <zim/fileiterator.h> #include <zim/fileiterator.h>
#include <pthread.h> #include <pthread.h>
#include <regex.h> #include <regex.h>
#include <zlib.h>
#include <kiwix/reader.h> #include <kiwix/reader.h>
#include <kiwix/searcher.h> #include <kiwix/searcher.h>
@ -111,6 +112,7 @@ static kiwix::Reader* reader;
static kiwix::Searcher* searcher; static kiwix::Searcher* searcher;
static pthread_mutex_t readerLock = PTHREAD_MUTEX_INITIALIZER; static pthread_mutex_t readerLock = PTHREAD_MUTEX_INITIALIZER;
static pthread_mutex_t searcherLock = PTHREAD_MUTEX_INITIALIZER; static pthread_mutex_t searcherLock = PTHREAD_MUTEX_INITIALIZER;
static pthread_mutex_t compressorLock = PTHREAD_MUTEX_INITIALIZER;
static bool hasSearchIndex = false; static bool hasSearchIndex = false;
static void appendToFirstOccurence(string &content, const string regex, const string &replacement) { static void appendToFirstOccurence(string &content, const string regex, const string &replacement) {
@ -126,6 +128,11 @@ static void appendToFirstOccurence(string &content, const string regex, const st
regfree(&regexp); regfree(&regexp);
} }
/* For compression */
#define COMPRESSOR_BUFFER_SIZE 5000000
static Bytef *compr = (Bytef *)malloc(COMPRESSOR_BUFFER_SIZE);
static uLongf comprLen;
static int accessHandlerCallback(void *cls, static int accessHandlerCallback(void *cls,
struct MHD_Connection * connection, struct MHD_Connection * connection,
const char * url, const char * url,
@ -146,6 +153,11 @@ static int accessHandlerCallback(void *cls,
return MHD_YES; return MHD_YES;
} }
/* Check if the response can be compressed */
const string acceptEncodingHeaderValue = MHD_lookup_connection_value(connection, MHD_HEADER_KIND, MHD_HTTP_HEADER_ACCEPT_ENCODING) ?
MHD_lookup_connection_value(connection, MHD_HEADER_KIND, MHD_HTTP_HEADER_ACCEPT_ENCODING) : "";
const bool acceptEncodingDeflate = (!acceptEncodingHeaderValue.empty() && acceptEncodingHeaderValue.find("deflate") != string::npos ? true : false );
/* Prepare the variables */ /* Prepare the variables */
struct MHD_Response *response; struct MHD_Response *response;
string content = ""; string content = "";
@ -177,16 +189,15 @@ static int accessHandlerCallback(void *cls,
content += "</ol></body></html>\n"; content += "</ol></body></html>\n";
mimeType = "text/html; charset=utf-8"; mimeType = "text/html; charset=utf-8";
contentLength = content.size();
/* Mutex unlock */ /* Mutex unlock */
pthread_mutex_unlock(&searcherLock); pthread_mutex_unlock(&searcherLock);
} else { } else {
/* urlstr */ /* urlstr */
std::string urlStr = string(url); std::string urlStr = string(url);
/* Mutex Lock */ /* Mutex Lock */
pthread_mutex_lock(&readerLock); pthread_mutex_lock(&readerLock);
@ -213,7 +224,22 @@ static int accessHandlerCallback(void *cls,
if (hasSearchIndex && mimeType.find("text/html") != string::npos) { if (hasSearchIndex && mimeType.find("text/html") != string::npos) {
appendToFirstOccurence(content, "<head>", HTMLScripts); appendToFirstOccurence(content, "<head>", HTMLScripts);
appendToFirstOccurence(content, "<body[^>]*>", HTMLDiv); appendToFirstOccurence(content, "<body[^>]*>", HTMLDiv);
contentLength = content.size(); }
/* Compute the lengh */
contentLength = content.size();
/* Compress the content if necessary */
if (acceptEncodingDeflate && mimeType.find("text/html") != string::npos) {
pthread_mutex_lock(&compressorLock);
comprLen = COMPRESSOR_BUFFER_SIZE;
compress(compr, &comprLen, (const Bytef*)(content.data()), contentLength);
content = string((char *)compr, comprLen);
contentLength = comprLen;
pthread_mutex_unlock(&compressorLock);
} }
/* clear context pointer */ /* clear context pointer */
@ -225,6 +251,11 @@ static int accessHandlerCallback(void *cls,
MHD_NO, MHD_NO,
MHD_YES); MHD_YES);
/* Add if necessary the content-encoding */
if (acceptEncodingDeflate && mimeType.find("text/html") != string::npos) {
MHD_add_response_header(response, "Content-encoding", "deflate");
}
/* Specify the mime type */ /* Specify the mime type */
MHD_add_response_header(response, "Content-Type", mimeType.c_str()); MHD_add_response_header(response, "Content-Type", mimeType.c_str());
@ -338,6 +369,7 @@ int main(int argc, char **argv) {
/* Mutex init */ /* Mutex init */
pthread_mutex_init(&readerLock, NULL); pthread_mutex_init(&readerLock, NULL);
pthread_mutex_init(&searcherLock, NULL); pthread_mutex_init(&searcherLock, NULL);
pthread_mutex_init(&compressorLock, NULL);
/* Start the HTTP daemon */ /* Start the HTTP daemon */
daemon = MHD_start_daemon(MHD_USE_THREAD_PER_CONNECTION, daemon = MHD_start_daemon(MHD_USE_THREAD_PER_CONNECTION,
@ -362,6 +394,7 @@ int main(int argc, char **argv) {
/* Mutex destroy */ /* Mutex destroy */
pthread_mutex_destroy(&readerLock); pthread_mutex_destroy(&readerLock);
pthread_mutex_destroy(&searcherLock); pthread_mutex_destroy(&searcherLock);
pthread_mutex_destroy(&compressorLock);
exit(0); exit(0);
} }