hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'development' into LTS_development

Browse source 
# Conflicts:
#	CMakeLists.txt
#	src/input/input_buffer.cpp
This commit is contained in:
Thulinma 2017-07-22 18:55:12 +02:00
commit d42bf9777e
23 changed files with 381 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/http_parser.cpp
View file

@ -154,7 +154,7 @@ std::string HTTP::URL::getBareUrl() const{
}
///Returns a URL object for the given link, resolved relative to the current URL object.
HTTP::URL HTTP::URL::link(const std::string &l){
HTTP::URL HTTP::URL::link(const std::string &l) const{
//Full link
if (l.find("://") < l.find('/') && l.find('/' != std::string::npos)){
DONTEVEN_MSG("Full link: %s", l.c_str());