Merge r1532281, r1532289, r1537718 from trunk:
* support/rotatelogs.c (get_now): Return the offset applied to the Unix time as a parameter. (doRotate): When exploding the time for strtfime formatting, iff in -l mode, subtract the offset and explode the real Unix time as a local time so %Z etc works correctly. * support/rotatelogs.c (get_now): Fix the NULL ptr dereferences added in r1532281. * support/rotatelogs.c: Introduce an adjusted_time_t type to store the weird "adjusted time since epoch" type returned by get_now(). Switch from int to long to fix an unnecessary Y2K38 issue. Adjust use throughout and clean up other type issues. No functional change intended apart from fixing Y2K38. Submitted by: jorton Reviewed by: jorton, jim, ylavic git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1826306 13f79535-47bb-0310-9956-ffa450edef68
parent
43f1c1f1
Please register or sign in to comment