jessica
/
Jupiter
mirror of https://github.com/JAJames/Jupiter.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

HTTP::Server: 

* Renamed 'parameters' to 'query_string'
* Question mark ('?') preceeding query_string is no longer included in the query_string
* Fixed a naming collision warning
release/0.19
Jessica James 9 years ago
parent
993a313b81
commit
73d555c31c
3 changed files with 43 additions and 43 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 74
      Jupiter/HTTP_Server.cpp
  2. 12
      Jupiter/HTTP_Server.h
  3. BIN
      Release/Jupiter.lib

74
Jupiter/HTTP_Server.cpp
View File

@ -1,5 +1,5 @@
/** /**
* Copyright (C) 2015 Jessica James. * Copyright (C) 2015-2016 Jessica James.
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above
@ -57,9 +57,9 @@ Jupiter::HTTP::Server::Content::Content(const Jupiter::ReadableString &in_name,
Jupiter::HTTP::Server::Content::name_checksum = Jupiter::HTTP::Server::Content::name.calcChecksum(); // switch to calcChecksumi to make case-insensitive Jupiter::HTTP::Server::Content::name_checksum = Jupiter::HTTP::Server::Content::name.calcChecksum(); // switch to calcChecksumi to make case-insensitive
} }
Jupiter::ReadableString *Jupiter::HTTP::Server::Content::execute(const Jupiter::ReadableString &parameters) Jupiter::ReadableString *Jupiter::HTTP::Server::Content::execute(const Jupiter::ReadableString &query_string)
{ {
return Jupiter::HTTP::Server::Content::function(parameters); return Jupiter::HTTP::Server::Content::function(query_string);
} }
// HTTP::Server::Directory // HTTP::Server::Directory
@ -180,12 +180,12 @@ Jupiter::HTTP::Server::Content *Jupiter::HTTP::Server::Directory::find(const Jup
return nullptr; // No such directory return nullptr; // No such directory
} }
Jupiter::ReadableString *Jupiter::HTTP::Server::Directory::execute(const Jupiter::ReadableString &in_name, const Jupiter::ReadableString &parameters) Jupiter::ReadableString *Jupiter::HTTP::Server::Directory::execute(const Jupiter::ReadableString &in_name, const Jupiter::ReadableString &query_string)
{ {
Jupiter::HTTP::Server::Content *content = Jupiter::HTTP::Server::Directory::find(in_name); Jupiter::HTTP::Server::Content *content_ptr = Jupiter::HTTP::Server::Directory::find(in_name);
if (content == nullptr) if (content_ptr == nullptr)
return nullptr; return nullptr;
return content->execute(parameters); return content_ptr->execute(query_string);
} }
// HTTP::Server::Host // HTTP::Server::Host
@ -240,8 +240,8 @@ struct Jupiter::HTTP::Server::Data
Jupiter::HTTP::Server::Host *find_host(const Jupiter::ReadableString &name); Jupiter::HTTP::Server::Host *find_host(const Jupiter::ReadableString &name);
Content *find(const Jupiter::ReadableString &name); Content *find(const Jupiter::ReadableString &name);
Content *find(const Jupiter::ReadableString &hostname, const Jupiter::ReadableString &name); Content *find(const Jupiter::ReadableString &hostname, const Jupiter::ReadableString &name);
Jupiter::ReadableString *execute(const Jupiter::ReadableString &name, const Jupiter::ReadableString &parameters); Jupiter::ReadableString *execute(const Jupiter::ReadableString &name, const Jupiter::ReadableString &query_string);
Jupiter::ReadableString *execute(const Jupiter::ReadableString &hostname, const Jupiter::ReadableString &name, const Jupiter::ReadableString &parameters); Jupiter::ReadableString *execute(const Jupiter::ReadableString &hostname, const Jupiter::ReadableString &name, const Jupiter::ReadableString &query_string);
int process_request(HTTPSession &session); int process_request(HTTPSession &session);
@ -386,20 +386,20 @@ Jupiter::HTTP::Server::Content *Jupiter::HTTP::Server::Data::find(const Jupiter:
return host->find(name); return host->find(name);
} }
Jupiter::ReadableString *Jupiter::HTTP::Server::Data::execute(const Jupiter::ReadableString &name, const Jupiter::ReadableString &parameters) Jupiter::ReadableString *Jupiter::HTTP::Server::Data::execute(const Jupiter::ReadableString &name, const Jupiter::ReadableString &query_string)
{ {
Jupiter::HTTP::Server::Content *content = Jupiter::HTTP::Server::Data::find(name); Jupiter::HTTP::Server::Content *content = Jupiter::HTTP::Server::Data::find(name);
if (content == nullptr) if (content == nullptr)
return nullptr; return nullptr;
return content->execute(parameters); return content->execute(query_string);
} }
Jupiter::ReadableString *Jupiter::HTTP::Server::Data::execute(const Jupiter::ReadableString &hostname, const Jupiter::ReadableString &name, const Jupiter::ReadableString &parameters) Jupiter::ReadableString *Jupiter::HTTP::Server::Data::execute(const Jupiter::ReadableString &hostname, const Jupiter::ReadableString &name, const Jupiter::ReadableString &query_string)
{ {
Jupiter::HTTP::Server::Content *content = Jupiter::HTTP::Server::Data::find(hostname, name); Jupiter::HTTP::Server::Content *content = Jupiter::HTTP::Server::Data::find(hostname, name);
if (content == nullptr) if (content == nullptr)
return nullptr; return nullptr;
return content->execute(parameters); return content->execute(query_string);
} }
char *html_time() char *html_time()
@ -415,7 +415,7 @@ int Jupiter::HTTP::Server::Data::process_request(HTTPSession &session)
Jupiter::ReadableString::TokenizeResult<Jupiter::Reference_String> lines = Jupiter::ReferenceString::tokenize(session.request, STRING_LITERAL_AS_REFERENCE(ENDL)); Jupiter::ReadableString::TokenizeResult<Jupiter::Reference_String> lines = Jupiter::ReferenceString::tokenize(session.request, STRING_LITERAL_AS_REFERENCE(ENDL));
HTTPCommand command = HTTPCommand::NONE_SPECIFIED; HTTPCommand command = HTTPCommand::NONE_SPECIFIED;
Content *content = nullptr; Content *content = nullptr;
Jupiter::ReferenceString content_parameters; Jupiter::ReferenceString query_string;
Jupiter::ReferenceString first_token; Jupiter::ReferenceString first_token;
size_t index = 0; size_t index = 0;
size_t span; size_t span;
@ -447,7 +447,7 @@ int Jupiter::HTTP::Server::Data::process_request(HTTPSession &session)
if (content != nullptr) if (content != nullptr)
{ {
// 200 (success) // 200 (success)
Jupiter::ReadableString *content_result = content->execute(content_parameters); Jupiter::ReadableString *content_result = content->execute(query_string);
switch (session.version) switch (session.version)
{ {
@ -582,24 +582,24 @@ int Jupiter::HTTP::Server::Data::process_request(HTTPSession &session)
{ {
command = HTTPCommand::GET; command = HTTPCommand::GET;
content_parameters = line.getWord(1, " "); query_string = line.getWord(1, " ");
span = content_parameters.find('?'); // repurposing 'span' span = query_string.find('?'); // repurposing 'span'
if (span == Jupiter::INVALID_INDEX) if (span == Jupiter::INVALID_INDEX)
{ {
if (session.host == nullptr) if (session.host == nullptr)
content = Jupiter::HTTP::Server::Data::find(content_parameters); content = Jupiter::HTTP::Server::Data::find(query_string);
else else
content = session.host->find(content_parameters); content = session.host->find(query_string);
content_parameters.erase(); query_string.erase();
} }
else else
{ {
if (session.host == nullptr) if (session.host == nullptr)
content = Jupiter::HTTP::Server::Data::find(content_parameters.substring(0U, span)); content = Jupiter::HTTP::Server::Data::find(query_string.substring(0U, span));
else else
content = session.host->find(content_parameters.substring(0U, span)); content = session.host->find(query_string.substring(0U, span));
content_parameters.shiftRight(span); query_string.shiftRight(span + 1);
// decode content_parameters here // decode query_string here
} }
Jupiter::ReferenceString protocol_str = line.getWord(2, " "); Jupiter::ReferenceString protocol_str = line.getWord(2, " ");
@ -615,24 +615,24 @@ int Jupiter::HTTP::Server::Data::process_request(HTTPSession &session)
{ {
command = HTTPCommand::HEAD; command = HTTPCommand::HEAD;
content_parameters = line.getWord(1, " "); query_string = line.getWord(1, " ");
span = content_parameters.find('?'); // repurposing 'span' span = query_string.find('?'); // repurposing 'span'
if (span == Jupiter::INVALID_INDEX) if (span == Jupiter::INVALID_INDEX)
{ {
if (session.host == nullptr) if (session.host == nullptr)
content = Jupiter::HTTP::Server::Data::find(content_parameters); content = Jupiter::HTTP::Server::Data::find(query_string);
else else
content = session.host->find(content_parameters); content = session.host->find(query_string);
content_parameters.erase(); query_string.erase();
} }
else else
{ {
if (session.host == nullptr) if (session.host == nullptr)
content = Jupiter::HTTP::Server::Data::find(content_parameters.substring(0U, span)); content = Jupiter::HTTP::Server::Data::find(query_string.substring(0U, span));
else else
content = session.host->find(content_parameters.substring(0U, span)); content = session.host->find(query_string.substring(0U, span));
content_parameters.shiftRight(span); query_string.shiftRight(span + 1);
// decode content_parameters here // decode query_string here
} }
Jupiter::ReferenceString protocol_str = line.getWord(2, " "); Jupiter::ReferenceString protocol_str = line.getWord(2, " ");
@ -708,14 +708,14 @@ Jupiter::HTTP::Server::Content *Jupiter::HTTP::Server::find(const Jupiter::Reada
return Jupiter::HTTP::Server::data_->find(host, name); return Jupiter::HTTP::Server::data_->find(host, name);
} }
Jupiter::ReadableString *Jupiter::HTTP::Server::execute(const Jupiter::ReadableString &name, const Jupiter::ReadableString &parameters) Jupiter::ReadableString *Jupiter::HTTP::Server::execute(const Jupiter::ReadableString &name, const Jupiter::ReadableString &query_string)
{ {
return Jupiter::HTTP::Server::data_->execute(name, parameters); return Jupiter::HTTP::Server::data_->execute(name, query_string);
} }
Jupiter::ReadableString *Jupiter::HTTP::Server::execute(const Jupiter::ReadableString &host, const Jupiter::ReadableString &name, const Jupiter::ReadableString &parameters) Jupiter::ReadableString *Jupiter::HTTP::Server::execute(const Jupiter::ReadableString &host, const Jupiter::ReadableString &name, const Jupiter::ReadableString &query_string)
{ {
return Jupiter::HTTP::Server::data_->execute(host, name, parameters); return Jupiter::HTTP::Server::data_->execute(host, name, query_string);
} }
bool Jupiter::HTTP::Server::bind(const Jupiter::ReadableString &hostname, uint16_t port) bool Jupiter::HTTP::Server::bind(const Jupiter::ReadableString &hostname, uint16_t port)

12
Jupiter/HTTP_Server.h
View File

@ -1,5 +1,5 @@
/** /**
* Copyright (C) 2015 Jessica James. * Copyright (C) 2015-2016 Jessica James.
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above
@ -45,7 +45,7 @@ namespace Jupiter
virtual int think(); virtual int think();
public: // Server public: // Server
typedef Jupiter::ReadableString *HTTPFunction(const Jupiter::ReadableString &parameters); typedef Jupiter::ReadableString *HTTPFunction(const Jupiter::ReadableString &query_string);
static const Jupiter::ReadableString &global_namespace; static const Jupiter::ReadableString &global_namespace;
static const Jupiter::ReadableString &server_string; static const Jupiter::ReadableString &server_string;
@ -58,7 +58,7 @@ namespace Jupiter
const Jupiter::ReadableString *type = nullptr; // Pointer to a constant (or otherwise managed) string const Jupiter::ReadableString *type = nullptr; // Pointer to a constant (or otherwise managed) string
const Jupiter::ReadableString *charset = nullptr; // Pointer to a constant (or otherwise managed) string const Jupiter::ReadableString *charset = nullptr; // Pointer to a constant (or otherwise managed) string
virtual Jupiter::ReadableString *execute(const Jupiter::ReadableString &parameters); virtual Jupiter::ReadableString *execute(const Jupiter::ReadableString &query_string);
Content(const Jupiter::ReadableString &in_name, Jupiter::HTTP::Server::HTTPFunction in_function); Content(const Jupiter::ReadableString &in_name, Jupiter::HTTP::Server::HTTPFunction in_function);
}; };
@ -75,7 +75,7 @@ namespace Jupiter
virtual bool remove(const Jupiter::ReadableString &name); virtual bool remove(const Jupiter::ReadableString &name);
virtual bool has(const Jupiter::ReadableString &name); virtual bool has(const Jupiter::ReadableString &name);
virtual Jupiter::HTTP::Server::Content *find(const Jupiter::ReadableString &name); virtual Jupiter::HTTP::Server::Content *find(const Jupiter::ReadableString &name);
virtual Jupiter::ReadableString *execute(const Jupiter::ReadableString &name, const Jupiter::ReadableString &parameters); virtual Jupiter::ReadableString *execute(const Jupiter::ReadableString &name, const Jupiter::ReadableString &query_string);
Directory(const Jupiter::ReadableString &in_name); Directory(const Jupiter::ReadableString &in_name);
virtual ~Directory(); virtual ~Directory();
@ -100,8 +100,8 @@ namespace Jupiter
bool has(const Jupiter::ReadableString &host, const Jupiter::ReadableString &name); bool has(const Jupiter::ReadableString &host, const Jupiter::ReadableString &name);
Content *find(const Jupiter::ReadableString &name); Content *find(const Jupiter::ReadableString &name);
Content *find(const Jupiter::ReadableString &host, const Jupiter::ReadableString &name); Content *find(const Jupiter::ReadableString &host, const Jupiter::ReadableString &name);
Jupiter::ReadableString *execute(const Jupiter::ReadableString &name, const Jupiter::ReadableString &parameters); Jupiter::ReadableString *execute(const Jupiter::ReadableString &name, const Jupiter::ReadableString &query_string);
Jupiter::ReadableString *execute(const Jupiter::ReadableString &host, const Jupiter::ReadableString &name, const Jupiter::ReadableString &parameters); Jupiter::ReadableString *execute(const Jupiter::ReadableString &host, const Jupiter::ReadableString &name, const Jupiter::ReadableString &query_string);
bool bind(const Jupiter::ReadableString &hostname, uint16_t port = 80); bool bind(const Jupiter::ReadableString &hostname, uint16_t port = 80);
bool tls_bind(const Jupiter::ReadableString &hostname, uint16_t port = 443); bool tls_bind(const Jupiter::ReadableString &hostname, uint16_t port = 443);

BIN
Release/Jupiter.lib
View File

Binary file not shown.
Write Preview
Loading…
Cancel
Save