|
@@ -11,7 +11,7 @@
|
11
|
11
|
|
12
|
12
|
<!-- Extract the entire domain contents -->
|
13
|
13
|
<propertyregex property="extracted" override="true" input="@{contents}" select="\1" defaultvalue="">
|
14
|
|
- <regexp pattern="(?si)^.*\n\Q@{domain}\E:\n(.*?)(\n[^\n]+:\n|$)"/>
|
|
14
|
+ <regexp pattern="(?si)^.*[\r\n]+\Q@{domain}\E:[\r\n]+(.*?)([\r\n]+[^\r\n]+:[\r\n]+|$)"/>
|
15
|
15
|
</propertyregex>
|
16
|
16
|
|
17
|
17
|
<!-- Trim leading whitespace -->
|
|
@@ -31,7 +31,7 @@
|
31
|
31
|
|
32
|
32
|
<!-- Extract the raw value -->
|
33
|
33
|
<propertyregex property="extracted" override="true" input="@{domaincontents}" select="\1">
|
34
|
|
- <regexp pattern="(?mi)^\s*\Q@{setting}\E\s*=\s*(.*?)$"/>
|
|
34
|
+ <regexp pattern="(?mi)^\s*\Q@{setting}\E\s*=\s*(.*?)[\r\n]*?$"/>
|
35
|
35
|
</propertyregex>
|
36
|
36
|
|
37
|
37
|
<!-- Unescape \r, \n, \=, \#, \: and \\ -->
|