diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-10-31 20:38:38 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-10-31 20:38:38 +0200 |
| commit | 54463b33b3169f9d1ed6aefcc321e3715c066bd5 (patch) | |
| tree | cd111785fb782181d7a9eebda0a80f53f2587ad3 /contrib/epee/include/net/http_protocol_handler.h | |
| parent | Merge pull request #2711 (diff) | |
| parent | RPC Add cross origin resource sharing support (diff) | |
| download | monero-54463b33b3169f9d1ed6aefcc321e3715c066bd5.tar.xz | |
Merge pull request #2723
69c37200 RPC Add cross origin resource sharing support (Tim L)
Diffstat (limited to 'contrib/epee/include/net/http_protocol_handler.h')
| -rwxr-xr-x[-rw-r--r--] | contrib/epee/include/net/http_protocol_handler.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/contrib/epee/include/net/http_protocol_handler.h b/contrib/epee/include/net/http_protocol_handler.h index babe49ad7..652d8ff6f 100644..100755 --- a/contrib/epee/include/net/http_protocol_handler.h +++ b/contrib/epee/include/net/http_protocol_handler.h @@ -54,6 +54,7 @@ namespace net_utils struct http_server_config { std::string m_folder; + std::vector<std::string> m_access_control_origins; boost::optional<login> m_user; critical_section m_lock; }; @@ -193,6 +194,7 @@ namespace net_utils response.m_response_code = 200; response.m_response_comment = "OK"; response.m_body.clear(); + return m_config.m_phandler->handle_http_request(query_info, response, m_conn_context); } |