Commit bb630d1a authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Merge r1822931, r1827783 from trunk:

* modules/loggers/mod_logio.c (logio_pre_config): Remove pointless
  static in optional fn pointer variable declaration.

* modules/ssl/ssl_engine_vars.c (ssl_var_log_config_register):
  Likewise.


Fix a potential compiler warning about uninitialized variable.
PR 59821
Submitted by: jorton, jailletc36
Reviewed by: jailletc36, jorton, ylavic


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1828744 13f79535-47bb-0310-9956-ffa450edef68
parent 5bd21f71
Loading
Loading
Loading
Loading
+0 −10
Original line number Diff line number Diff line
@@ -122,16 +122,6 @@ RELEASE SHOWSTOPPERS:
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
  [ start all new proposals below, under PATCHES PROPOSED. ]

  *) Some easy proposals:
        - mod_logio, mod_ssl: Remove pointless static in optional fn pointer
          variable declaration
        - core: Fix a potential compiler warning about uninitialized variable.
          PR 59821
     trunk patch: http://svn.apache.org/r1822931
                  http://svn.apache.org/r1827783
     2.4.x patch: svn merge -c 1822931,1827783 ^/httpd/httpd/trunk .
     +1: jailletc36, jorton, ylavic

  *) mod_ssl: Use 'ap_log_rerror()' instead of 'ap_log_error()' consistently
     PR 62003
     trunk patch: http://svn.apache.org/r1827865