diff options
| author | David M. Lee <dlee@digium.com> | 2013-07-03 16:32:00 +0000 |
|---|---|---|
| committer | David M. Lee <dlee@digium.com> | 2013-07-03 16:32:00 +0000 |
| commit | dcf03554a0b38806bf1fe258acc423b070533d6e (patch) | |
| tree | 150af1502fcf5576c1bae7cc43f0595f46456883 /res/Makefile | |
| parent | 85ba0633298e42e723ce136e867780c115c7fb6e (diff) | |
Shuffle RESTful URL's around.
This patch moves the RESTful URL's around to more appropriate
locations for release.
The /stasis URL's are moved to /ari, since Asterisk REST Interface was
a more appropriate name than Stasis-HTTP. (Most of the code still has
stasis_http references, but they will be cleaned up after there are no
more outstanding branches that would have merge conflicts with such a
change).
A larger change was moving the ARI events WebSocket off of the shared
/ws URL to its permanent home on /ari/events. The Swagger code
generator was extended to handle "upgrade: websocket" and
"websocketProtocol:" attributes on an operation.
The WebSocket module was modified to better handle WebSocket servers
that have a single registered protocol handler. If a client
connections does not specify the Sec-WebSocket-Protocol header, and
the server has a single protocol handler registered, the WebSocket
server will go ahead and accept the client for that subprotocol.
(closes issue ASTERISK-21857)
Review: https://reviewboard.asterisk.org/r/2621/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@393528 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/Makefile')
| -rw-r--r-- | res/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/res/Makefile b/res/Makefile index 667e097e8..c69862802 100644 --- a/res/Makefile +++ b/res/Makefile @@ -80,5 +80,8 @@ clean:: $(if $(filter res_parking,$(EMBEDDED_MODS)),modules.link,res_parking.so): $(subst .c,.o,$(wildcard parking/*.c)) $(subst .c,.o,$(wildcard parking/*.c)): _ASTCFLAGS+=$(call MOD_ASTCFLAGS,res_parking) +res_stasis_http.so: stasis_http/ari_websockets.o +stasis_http/ari_websockets.o: _ASTCFLAGS+=$(call MOD_ASTCFLAGS,res_stasis_http_asterisk) + # Dependencies for res_stasis_http_*.so are generated, so they're in this file include stasis_http.make |