Merge branch 'master' of https://github.com/mholt/caddy

app/app.go

@@ -20,7 +20,7 @@ const (
 	Name = "Caddy"
 
 	// Version is the program version
-	Version = "0.7.2"
+	Version = "0.7.3"
 )
 
 var (

dist/CHANGES.txt

@@ -1,10 +1,11 @@
 CHANGES
 
-<master>
+0.7.3 (July 15, 2015)
-- errors: Error log now includes timestamp with each entry
+- errors: Error log now shows timestamp with each entry
-- gzip: Default filtering is by extension (fixes bug); removed MIME type filter
+- gzip: Fixed; Default filtering is by extension; removed MIME type filter
 - import: Fixed; works inside and outside server blocks
-- templates: Restricted or missing files result in proper 403 or 404 error
+- redir: Query string preserved on catch-all redirects
+- templates: Proper 403 or 404 errors for restricted or missing files
 
 
 0.7.2 (July 1, 2015)

dist/README.txt

@@ -1,4 +1,4 @@
-CADDY 0.7.2
+CADDY 0.7.3
 
 Website
 	https://caddyserver.com

dist/automate.sh

@@ -19,28 +19,37 @@ ReleaseDir=$DistDir/release
 # Compile binaries
 mkdir -p $BuildDir
 cd $BuildDir
-rm -f *
+rm -f caddy*
 gox $Package
 
 # Zip them up with release notes and stuff
 mkdir -p $ReleaseDir
 cd $ReleaseDir
-rm -f *
+rm -f caddy*
 for f in $BuildDir/*
 do
 	# Name .zip file same as binary, but strip .exe from end
-	zipname=$(basename ${f%".exe"}).zip
+	zipname=$(basename ${f%".exe"})
+	if [[ $f == *"linux"* ]] || [[ $f == *"bsd"* ]]; then
+		zipname=${zipname}.tar.gz
+	else
+		zipname=${zipname}.zip
+	fi
 
 	# Binary inside the zip file is simply the project name
-	bin=$BuildDir/$(basename $Package)
+	binbase=$(basename $Package)
-	if [[ $f == *.exe ]]
+	if [[ $f == *.exe ]]; then
-	then
+		binbase=$binbase.exe
-		bin=$bin.exe
 	fi
+	bin=$BuildDir/$binbase
 	mv $f $bin
 
 	# Compress distributable
-	zip -j $zipname $bin $DistDir/CHANGES.txt $DistDir/LICENSES.txt $DistDir/README.txt
+	if [[ $zipname == *.zip ]]; then
+		zip -j $zipname $bin $DistDir/CHANGES.txt $DistDir/LICENSES.txt $DistDir/README.txt
+	else
+		tar -cvzf $zipname -C $BuildDir $binbase -C $DistDir CHANGES.txt LICENSES.txt README.txt
+	fi
 
 	# Put binary filename back to original
 	mv $bin $f

middleware/redirect/redirect.go

@@ -23,7 +23,7 @@ type Redirect struct {
 func (rd Redirect) ServeHTTP(w http.ResponseWriter, r *http.Request) (int, error) {
 	for _, rule := range rd.Rules {
 		if rule.From == "/" {
-			// Catchall redirect preserves path (TODO: Standardize/formalize this behavior)
+			// Catchall redirect preserves path and query string
 			toURL, err := url.Parse(rule.To)
 			if err != nil {
 				return http.StatusInternalServerError, err