diff options
| author | Kinsey Moore <kmoore@digium.com> | 2013-06-24 13:49:20 +0000 |
|---|---|---|
| committer | Kinsey Moore <kmoore@digium.com> | 2013-06-24 13:49:20 +0000 |
| commit | a0b7a49a4a238207a2fe0a49fdc3b65994baa1a5 (patch) | |
| tree | 04bb2ee790a186b6d0865fd9aabc2817a9715f94 /main/http.c | |
| parent | cc29957a6f3339667f02a7386416c7374122d403 (diff) | |
Index installed sounds and implement ARI sounds queries
This adds support for stasis/sounds and stasis/sounds/{ID} queries via
the Asterisk RESTful Interface (ARI, formerly Stasis-HTTP).
The following changes have been made to accomplish this:
* A modular indexer was created for local media.
* A new function to get an ast_format associated with a file extension
was added.
* Modifications were made to the built-in HTTP server so that URI
decoding could be deferred to the URI handler when necessary.
* The Stasis-HTTP sounds JSON documentation was modified to handle
cases where multiple languages are installed in different formats.
* Register and Unregister events for formats were added to the system
topic.
(closes issue ASTERISK-21584)
(closes issue ASTERISK-21585)
Review: https://reviewboard.asterisk.org/r/2507/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@392700 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/http.c')
| -rw-r--r-- | main/http.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/main/http.c b/main/http.c index ec9517f2c..47f11c6fb 100644 --- a/main/http.c +++ b/main/http.c @@ -718,7 +718,6 @@ static int handle_uri(struct ast_tcptls_session_instance *ser, char *uri, } } } - ast_uri_decode(uri, ast_uri_http_legacy); AST_RWLIST_RDLOCK(&uri_redirects); AST_RWLIST_TRAVERSE(&uri_redirects, redirect, entry) { @@ -760,6 +759,9 @@ static int handle_uri(struct ast_tcptls_session_instance *ser, char *uri, AST_RWLIST_UNLOCK(&uris); } if (urih) { + if (!urih->no_decode_uri) { + ast_uri_decode(uri, ast_uri_http_legacy); + } res = urih->callback(ser, urih, uri, method, get_vars, headers); } else { ast_http_error(ser, 404, "Not Found", "The requested URL was not found on this server."); |