Permalink
Browse files

Merge branch 'master' of https://github.com/aerouk/imageserve

# Conflicts:
#	public/.htaccess
  • Loading branch information...
aerouk committed Feb 10, 2017
2 parents 7516946 + 3d113ce commit c4f183788f88f8e68b305c26d02d382a1f59d310
Showing with 5 additions and 0 deletions.
  1. +1 −0 .gitignore
  2. +4 −0 public/.htaccess
@@ -1,4 +1,5 @@
*.gif
*.jpg
*.jpeg
*.png
*.webm
@@ -15,4 +15,8 @@ RewriteRule ^/?$ viewer.php [L]
RewriteRule ^g/([^/\.]+)(.gif)?/?$ viewer.php?type=gif&file=$1 [L]
RewriteRule ^j/([^/\.]+)(.jpg|.jpeg)?/?$ viewer.php?type=jpeg&file=$1 [L]
RewriteRule ^w/([^/\.]+)(.webm)?/?$ viewer.php?type=webm&file=$1 [L]

RewriteRule ^([^/\.]+).gif/?$ viewer.php?type=gif&file=$1 [L]
RewriteRule ^([^/\.]+)(.jpg|.jpeg)/?$ viewer.php?type=jpeg&file=$1 [L]

RewriteRule ^([^/\.]+)(.png)?/?$ viewer.php?type=png&file=$1 [L]

0 comments on commit c4f1837

Please sign in to comment.