smallsolar
/
libkiwix
mirror of https://github.com/kiwix/libkiwix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #415 from kiwix/stop_server

This commit is contained in:
Matthieu Gautier 2020-10-16 14:12:47 +02:00 committed by GitHub
parent de6b8ba4de 632583ede2
commit 095c86cf90
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meson.build
View File

@ -63,7 +63,7 @@ subdir('static')
subdir('src') subdir('src')
subdir('test') subdir('test')
pkg_requires = ['libzim', 'icu-i18n', 'pugixml', 'libcurl'] pkg_requires = ['libzim', 'icu-i18n', 'pugixml', 'libcurl', 'libmicrohttpd']
pkg_conf = configuration_data() pkg_conf = configuration_data()
pkg_conf.set('prefix', get_option('prefix')) pkg_conf.set('prefix', get_option('prefix'))

2
src/server.cpp
View File

@ -53,8 +53,10 @@ bool Server::start() {
} }
void Server::stop() { void Server::stop() {
if (mp_server) {
mp_server->stop(); mp_server->stop();
mp_server.reset(nullptr); mp_server.reset(nullptr);
}
} }
void Server::setRoot(const std::string& root) void Server::setRoot(const std::string& root)

1
src/xmlrpc.h
View File

@ -3,6 +3,7 @@
#ifndef KIWIX_XMLRPC_H_ #ifndef KIWIX_XMLRPC_H_
#define KIWIX_XMLRPC_H_ #define KIWIX_XMLRPC_H_
#include <stdexcept>
#include <tools/otherTools.h> #include <tools/otherTools.h>
#include <pugixml.hpp> #include <pugixml.hpp>