Skip to content
  1. Apr 26, 2018
  3. Apr 21, 2018
  5. Apr 20, 2018
  7. Apr 19, 2018
  9. Apr 18, 2018
  11. Apr 17, 2018
  13. Apr 14, 2018
  15. Apr 12, 2018
  17. Apr 11, 2018
  19. Apr 09, 2018
    • Jim Jagielski's avatar
      Merge r1827865 from trunk: · d270870d
      Jim Jagielski authored 
      Use 'ap_log_rerror()' instead of 'ap_log_error()' consistently
Submitted by: jailletc36
Reviewed by: jailletc36, jorton, ylavic


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1828745 13f79535-47bb-0310-9956-ffa450edef68
      d270870d
    • Jim Jagielski's avatar
      Merge r1822931, r1827783 from trunk: · bb630d1a
      Jim Jagielski authored 
      * 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
      bb630d1a
    • Jim Jagielski's avatar
      Merge r1818802, r1818825 from trunk: · 5bd21f71
      Jim Jagielski authored 
      mod_dumpio: do nothing below log level TRACE7.

For instance, depending on EnableMMAP/Sendfile configuration, don't split
file brigades to 8K heap buckets upon reading.



mod_dumpio: follow up to r1818802.

Negate APLOGctrace7(c) test!

Also, return DECLINED when nothing is to be done, same result as OK but
possibly more semantically correct.


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


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1828743 13f79535-47bb-0310-9956-ffa450edef68
      5bd21f71
    • Jim Jagielski's avatar
      Merge r1822931, r1827783 from trunk: · a986919e
      Jim Jagielski authored 
      * 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@1828742 13f79535-47bb-0310-9956-ffa450edef68
      a986919e
    • Jim Jagielski's avatar
      Merge r1826973 from trunk: · f514203c
      Jim Jagielski authored 
      mod_md: Fix compilation with OpenSSL before version 1.0.2.

Symbol ASN1_TIME_diff is only available for 1.0.2+,
but luckily alternative code we can use is already
available, originally written for the LibreSSL case.

Submitted by: rjung
Reviewed by: rjung, ylavic, jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1828741 13f79535-47bb-0310-9956-ffa450edef68
      f514203c
    • Jim Jagielski's avatar
      Merge r1534895, r1534896, r1534914 from trunk: · 1d3d77f0
      Jim Jagielski authored 
      rotatelogs: Use apr_psprintf() with %pm instead of a constant length buffer for
errors.

* support/rotatelogs.c
  (post_rotate, doRotate): Switch to using apr_psprintf() with %pm.

Suggested by: rpluem


rotatelogs: Remove another use of a consant length buffer for errors.

* support/rotatelogs.c
  (doRotate): Use apr_psprintf() and %pm.  Move the destruction of the pool
    after we're done with the error message so the error string stays allocated
    long enough.


rotatelogs: Remove last constant length error buffer.

* support/rotatelogs.c
  (ERRMSGSZ): Remove.
  (rotate_status): Remove errbuff member.
  (truncate_and_write_error): Accept the error message as an argument.
  (doRotate): Shift the pool destruction slightly later and use it to generate
    the error message to pass truncate_and_write_error().
  (main): In case of write errors create a pool to generate the error message,
    since the other pools available may never been freed.  Adjust to pass
    message directly to truncate_and_write_error().

Submitted by: breser
Reviewed by: rjung, ylavic, jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1828739 13f79535-47bb-0310-9956-ffa450edef68
      1d3d77f0
    • Jim Jagielski's avatar
      Merge r1533810, r1533935, r1666417 from trunk: · 2bcf3961
      Jim Jagielski authored 
      Add an option to autocreate directories to rotatelogs.

* support/rotatelogs.c
  (rotate_config): Remove const from szLogRoot since we'll be passing it to
    apr_filepath_merge.  Add create_path member.
  (usage, dumpConfig): Update to reflect new -d option.
  (doRotate): Add code that knows how to create the directories a log file
    is going to go into.
  (main): Add the -d option and canonicalize the incoming path with
    apr_filepath_merge() so that the code in doRotate can work properly.

* docs/man/rotatelogs.8,
  docs/manual/programs/rotatelogs.html.en: Update for -d option.

PR: 46669
Submitted by: Philippe Lantin <plantin cobaltgroup.com>
              (which was actually a patch written by myself when I worked there)
Tweaked by: breser (ported to trunk and changed option from -p to -d)



Followup to r1533810: Put the rotatelogs docs in the right place.

* docs/man/rotatelogs.8,
  docs/manual/programs/rotatelogs.html.en: Remove changes from r1533810.

* docs/manual/programs/rotatelogs.xml: Adjust docs for new -d option. 


Choose "-D" instead of "-d" for the rotatelogs
option that creates the path to the log file.

I want to use "-d" for another directory related
option next where (I think) the "directory" "d"
makes more sense.

"-d" has not yet been backported, so changing
to "-D" is not a real compatibility issue.

Submitted by: breser, rjung
Reviewed by: rjung, ylavic, niq


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1828738 13f79535-47bb-0310-9956-ffa450edef68
      2bcf3961
    • Jim Jagielski's avatar
      Merge r1666415, r1780308 from trunk: · c8f096e1
      Jim Jagielski authored 
      Small changes to rotatelogs:
- add "-n num" to help text
- clarify in help text, that "program is invoked"
  is the "-p" case
- prevent crash with "-v" (verbose) if no
  "-p prog" is used
- add one space for formatting


rotatelogs: fix -n help text

this closes #24

Submitted By: Isaac Boukris <iboukris gmail.com>


Submitted by: rjung, covener
Reviewed by: rjung, ylavic, niq, jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1828736 13f79535-47bb-0310-9956-ffa450edef68
      c8f096e1
    • Jim Jagielski's avatar
      Merge r1828390 from trunk: · 2c7f44b1
      Jim Jagielski authored 
      mod_ssl: Fix merging of proxy SSL context outside <Proxy> sections.

Regression introduced in 2.4.30. PR 62232.

The proxy SSL_CTX was not inherited from the vhost (the only available in
2.4.29) in/for any directory context besides <Proxy>...

Mostly debugged and fixed by Rainer, thanks!


Submitted by: ylavic
Reviewed by: ylavic, rpluem, jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1828735 13f79535-47bb-0310-9956-ffa450edef68
      2c7f44b1
    • Jim Jagielski's avatar
      Merge r1827654, r1827671 from trunk: · 83e2fbe5
      Jim Jagielski authored 
      copy apr_sockaddr_is_wildcard to maintain 1.4.x support.




CHANGES for r1827654

Submitted by: covener
Reviewed by: covener, ylavic, rpluem, jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1828734 13f79535-47bb-0310-9956-ffa450edef68
      83e2fbe5
    • Jim Jagielski's avatar
      backport approvals · b964bcdc
      Jim Jagielski authored 
      

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1828733 13f79535-47bb-0310-9956-ffa450edef68
      b964bcdc