[master] cb12bdd vmodtool: fix first argument starting on new line

Nils Goroll nils.goroll at uplex.de
Mon Jun 13 15:22:08 CEST 2016


commit cb12bdd8429c0d879f8b8423cabefc0fc49f2a6b
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Mon Jun 13 15:20:56 2016 +0200

    vmodtool: fix first argument starting on new line
    
    Fixes issue reported by @carlosabalde in #1976

diff --git a/lib/libvcc/vmodtool.py b/lib/libvcc/vmodtool.py
index e321b9b..176f618 100755
--- a/lib/libvcc/vmodtool.py
+++ b/lib/libvcc/vmodtool.py
@@ -288,7 +288,7 @@ class prototype(object):
 		s = s[i:].strip()
 		assert s[0] == "("
 		assert s[-1] == ")"
-		s = s[1:-1]
+		s = s[1:-1].lstrip()
 		self.args = []
 		while len(s) > 0:
 			a,s = arg(s)
diff --git a/lib/libvmod_debug/vmod.vcc b/lib/libvmod_debug/vmod.vcc
index b172c74..b057ff2 100644
--- a/lib/libvmod_debug/vmod.vcc
+++ b/lib/libvmod_debug/vmod.vcc
@@ -94,7 +94,8 @@ $Function VOID rot52(HTTP hdr)
 Encrypt the HTTP header with quad-ROT13 encryption,
 (this is approx 33% better than triple-DES).
 
-$Function STRING argtest(STRING one, REAL two=2, STRING three="3",
+$Function STRING argtest(
+	  STRING one, REAL two=2, STRING three="3",
 	  STRING comma=",", INT four=4)
 
 $Function INT vre_limit()



More information about the varnish-commit mailing list