]> granicus.if.org Git - apache/commit
Merge r1713043, r1802305, r1802309 from trunk:
authorJim Jagielski <jim@apache.org>
Wed, 16 Aug 2017 16:50:29 +0000 (16:50 +0000)
committerJim Jagielski <jim@apache.org>
Wed, 16 Aug 2017 16:50:29 +0000 (16:50 +0000)
commit49543e24cc96e54f189d709dcdadf699f04d2edf
tree288e6cef3a63bc5beff4582de35ae1553eeaaaff
parent02b33c41ad5f07fc5bffa40415b5ccb2cd5e7d8a
Merge r1713043, r1802305, r1802309 from trunk:

Save a few bytes in conf pool when processing 'Define'.

+ some minor style issues
+ split long lines

Be explicit and safe (const) with the strings stored in ap_server_config_defines.

Follow up to r1713043.

ap_server_config_defines and ap_server_{pre,post}_read_config are arrays of
*const* strings (must not change after being inserted), make it explicit.

Submitted by: jailletc36, ylavic, ylavic
Reviewed by: ylavic, jorton, jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1805223 13f79535-47bb-0310-9956-ffa450edef68
STATUS
server/config.c
server/core.c
server/main.c