Refactoring conditional directives.

[wmarquesr]

A suggestion to compile entire statements and expressions, as suggested by code style guidelines from the Linux Kernel and practitioners.

• Linux kernel coding style
• Living in the #ifdef Hell

It might improve code understanding, maintainability and error-proneness.

[csanders-git]

I'll leave this for @zimmerle but you should check out the the libmodsecurity branch as it has been rewritten with a more logical design and stricter coding standards defined.

[zimmerle]

Hi @wmarquesr,

Thank you for the patch. The code is currently in our BuildBots.

Same modifications are more than welcomed on LibModSecurity, available here:
https://github.com/SpiderLabs/ModSecurity/tree/libmodsecurity

[zimmerle]

Hi @wmarquesr,

I left a comment in the patch:
https://github.com/wmarquesr/ModSecurity/commit/b7b10b5c005cd41e4c7ce1c775d4e83f2b9a3a98#commitcomment-14883469

Can you fix this?

[wmarquesr]

All fixed. Sorry for the mistake.

[zimmerle]

Thank you @wmarquesr,

Patch is on our buildbots again.

[zimmerle]

Hi @wmarquesr,

Still interested to provide the fix ?

[wmarquesr]

All fixed, sorry for delay.

[zimmerle]

Hi @wmarquesr,

Thank you! Your patch was merged and will be released as part of ModSecurity v2.9.1.

The same kind of patch are very welcomed in ModSecurity version 3:

• https://www.trustwave.com/Resources/SpiderLabs-Blog/An-Overview-of-the-Upcoming-libModSecurity/
• https://github.com/SpiderLabs/ModSecurity/tree/libmodsecurity/