jacob.eva
/
ejabberd-contrib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mod_http_upload: Omit expansion for "service_url" 

Don't expand the @HOST@ keyword within the "service_url" value, after
all.  The code didn't cope with an undefined "service_url", and the
@HOST@ expansion probably isn't too useful there, anyway.
This commit is contained in:
Holger Weiss 2015-08-23 19:37:09 +02:00
parent 374c1b6dfc
commit a00090086e
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mod_http_upload/README.txt
View File

@ -104,10 +104,8 @@ The configurable mod_http_upload options are:
If a 'service_url' is specified, HTTP upload slot requests are forwarded If a 'service_url' is specified, HTTP upload slot requests are forwarded
to this external service instead of being handled by mod_http_upload to this external service instead of being handled by mod_http_upload
itself. The keyword @HOST@ is replaced with the virtual host name. itself. An HTTP GET query such as the following is issued whenever an
HTTP upload slot request is accepted as per the 'access' rule:
An HTTP GET query such as the following is issued whenever an HTTP upload
slot request is accepted as per the 'access' rule:
http://localhost:5444/?jid=juliet%40example.com&size=10240&name=example.jpg http://localhost:5444/?jid=juliet%40example.com&size=10240&name=example.jpg

2
mod_http_upload/src/mod_http_upload.erl
View File

@ -246,7 +246,7 @@ init({ServerHost, Opts}) ->
docroot = expand_home(str:strip(DocRoot, right, $/)), docroot = expand_home(str:strip(DocRoot, right, $/)),
put_url = expand_host(str:strip(PutURL, right, $/), ServerHost), put_url = expand_host(str:strip(PutURL, right, $/), ServerHost),
get_url = expand_host(str:strip(GetURL, right, $/), ServerHost), get_url = expand_host(str:strip(GetURL, right, $/), ServerHost),
service_url = expand_host(ServiceURL, ServerHost)}}. service_url = ServiceURL}}.
-spec handle_call(_, {pid(), _}, state()) -> {noreply, state()}. -spec handle_call(_, {pid(), _}, state()) -> {noreply, state()}.