Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update apache_conf regular expression to exclude whitespace. #2416

Merged
merged 4 commits into from Dec 22, 2017
Merged

Update apache_conf regular expression to exclude whitespace. #2416

merged 4 commits into from Dec 22, 2017

Commits on Dec 22, 2017

  1. Update apache_conf test to check for ServerAlias values. 

    Signed-off-by: Miah Johnson <miah@chia-pet.org>
    @miah
    miah committed Dec 22, 2017
    Configuration menu
    Copy the full SHA
    c736d6f View commit details
    Browse the repository at this point in the history

  2. Add ServerAlias key and values to mock apache conf which includes 

    trailing whitespace.

Signed-off-by: Miah Johnson <miah@chia-pet.org>
    @miah
    miah committed Dec 22, 2017
    Configuration menu
    Copy the full SHA
    b8d3e0e View commit details
    Browse the repository at this point in the history

  3. Updated test to reflect all ServerAlias values being put into a single 

    array item. This is expected as we do not override the key_values
default setting of '1' when passing the raw configuration to
SimpleConfig.

Signed-off-by: Miah Johnson <miah@chia-pet.org>
    @miah
    miah committed Dec 22, 2017
    Configuration menu
    Copy the full SHA
    d96fadf View commit details
    Browse the repository at this point in the history

  4. Update the regular expression to include a conditional with positive 

    lookahead that checks if the line ends with one or more spaces. If the
lookahead succeeds we non-greedily capture, and when it fails we
greedily capture.

Signed-off-by: Miah Johnson <miah@chia-pet.org>
    @miah
    miah committed Dec 22, 2017
    Configuration menu
    Copy the full SHA
    b659b21 View commit details
    Browse the repository at this point in the history