Handle # comment characters inside quotes

#75

Author: jcameron

virtualmin-nginx-lib.pl

@@ -54,6 +54,22 @@ sub flush_config_cache
 undef($get_config_cache);
 }
 
+# remove_hash_comment(line)
+# Returns the line with comments removed
+sub remove_hash_comment
+{
+my ($l) = @_;
+if ($l =~ /".*#.*"/) {
+	# Comment inside quotes, so only remove any comment outside quotes
+	$l =~ s/#[^"]*$//;
+	}
+else {
+	# Remove all comments
+	$l =~ s/#.*$//;
+	}
+return $l;
+}
+
 # read_config_file(file, [preserve-includes])
 # Returns an array ref of nginx config objects
 sub read_config_file
@@ -72,15 +88,15 @@ sub read_config_file
 close($fh);
 while(@lines) {
 	my $l = shift(@lines);
-	$l =~ s/#.*$//;
+	$l = &remove_hash_comment($l);
 	my $slnum = $lnum;
 
 	# If line doesn't end with { } or ; , it must be continued on the
 	# next line
 	while($l =~ /\S/ && $l !~ /[\{\}\;]\s*$/ && @lines) {
 		my $nl = shift(@lines);
 		if ($nl =~ /\S/) {
-			$nl =~ s/#.*$//;
+			$nl = &remove_hash_comment($nl);
 			$l .= " ".$nl;
 			}
 		$lnum++;