Merge pull request #459 from pradermecker/pra

Guard against undef
voxpupuli · Sep 24, 2014 · 60efade · 60efade
2 parents 8cd1633 + 0a46f25
commit 60efade
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/manifests/resource/location.pp b/manifests/resource/location.pp
@@ -199,7 +199,9 @@
   if ($proxy != undef) {
     validate_string($proxy)
   }
-  validate_string($proxy_redirect)
+  if ($proxy_redirect != undef) {
+    validate_string($proxy_redirect)
+  }
   validate_string($proxy_read_timeout)
   validate_string($proxy_connect_timeout)
   validate_array($proxy_set_header)

diff --git a/manifests/resource/vhost.pp b/manifests/resource/vhost.pp
@@ -287,7 +287,9 @@
     validate_string($proxy)
   }
   validate_string($proxy_read_timeout)
-  validate_string($proxy_redirect)
+  if ($proxy_redirect != undef) {
+    validate_string($proxy_redirect)
+  }
   validate_array($proxy_set_header)
   if ($proxy_cache != false) {
     validate_string($proxy_cache)