Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
envsetup
Manage
Activity
Members
Plan
Redmine
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mediaserver
envsetup
Commits
bdb048c1
Commit
bdb048c1
authored
8 years ago
by
Stéphane Diemer
Browse files
Options
Downloads
Patches
Plain Diff
Drop args in /streaming (refs
#18553
).
parent
ea5531cb
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
6.Nginx/vhost_mediaserver-msuser.conf
+3
-3
3 additions, 3 deletions
6.Nginx/vhost_mediaserver-msuser.conf
with
3 additions
and
3 deletions
6.Nginx/vhost_mediaserver-msuser.conf
+
3
−
3
View file @
bdb048c1
...
@@ -56,7 +56,7 @@ server {
...
@@ -56,7 +56,7 @@ server {
}
}
location
/
streaming
/ {
location
/
streaming
/ {
location
~ \.
m3u8
$ {
location
~ \.
m3u8
$ {
rewrite
^/
streaming
/(.*)$ /
live
/$
1
break
;
rewrite
^/
streaming
/(.*)$ /
live
/$
1
?
break
;
proxy_pass
http
://
localhost
:
1935
;
proxy_pass
http
://
localhost
:
1935
;
add_header
Access
-
Control
-
Allow
-
Origin
"*"
;
add_header
Access
-
Control
-
Allow
-
Origin
"*"
;
add_header
X
-
Cache
$
upstream_cache_status
;
add_header
X
-
Cache
$
upstream_cache_status
;
...
@@ -69,7 +69,7 @@ server {
...
@@ -69,7 +69,7 @@ server {
proxy_cache_valid
200
1
s
;
proxy_cache_valid
200
1
s
;
}
}
location
~ \.
ts
$ {
location
~ \.
ts
$ {
rewrite
^/
streaming
/(.*)$ /
live
/$
1
break
;
rewrite
^/
streaming
/(.*)$ /
live
/$
1
?
break
;
proxy_pass
http
://
localhost
:
1935
;
proxy_pass
http
://
localhost
:
1935
;
add_header
Access
-
Control
-
Allow
-
Origin
"*"
;
add_header
Access
-
Control
-
Allow
-
Origin
"*"
;
add_header
X
-
Cache
$
upstream_cache_status
;
add_header
X
-
Cache
$
upstream_cache_status
;
...
@@ -81,7 +81,7 @@ server {
...
@@ -81,7 +81,7 @@ server {
proxy_cache_valid
200
10
s
;
proxy_cache_valid
200
10
s
;
}
}
# only urls to ts and m3u8 files are allowed, discard any requested path for other urls
# only urls to ts and m3u8 files are allowed, discard any requested path for other urls
rewrite
^/
streaming
/(.*)$ /
live
/
break
;
rewrite
^/
streaming
/(.*)$ /
live
/
?
break
;
proxy_pass
http
://
localhost
:
1935
/
live
/;
proxy_pass
http
://
localhost
:
1935
/
live
/;
}
}
location
/ {
location
/ {
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment