summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorGuillaume Delacour <gui@iroqwa.org>2016-08-01 23:52:38 +0200
committerdormando <dormando@rydia.net>2016-08-11 14:45:19 -0700
commit6fee85996d5dceb269fac590d2d06a19996b8aee (patch)
tree208ecf0314eec450d60ffe4c737dc8299994aa60 /scripts
parent11124b843f356236bbd5760b50df6e81e83e4a23 (diff)
downloadmemcached-6fee85996d5dceb269fac590d2d06a19996b8aee.tar.gz
Handle end of line comment on memcached.conf
From http://code.google.com/p/memcached/issues/detail?id=283
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/start-memcached2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/start-memcached b/scripts/start-memcached
index 8b64a20..164c9bd 100755
--- a/scripts/start-memcached
+++ b/scripts/start-memcached
@@ -62,7 +62,7 @@ if(open $etchandle, $etcfile)
foreach my $line (<$etchandle>)
{
$line ||= "";
- $line =~ s/\#.*//g;
+ $line =~ s/(?<!\\)\#[^\#]*//g;
$line =~ s/\s+$//g;
$line =~ s/^\s+//g;
next unless $line;