Skip to content
GitLab
  1. 02 Dec, 2016 4 commits
    • Jim Jagielski's avatar
      Merge r1738628, r1757009, r1756848, r1757029 from trunk: · a489a662
      Jim Jagielski authored 
      Display process slot number in the async overview 


Fix the number of column for 'Async connections'.
There are only 3 columns (writing, keep-alive, closing), not 4.

Try to improve the code layout for it to be more readable.
Each <th> is on its own line so keep the corresponding "colspan" <td> fields grouped together.

r1738628 introduced a new column, 'Slot'.
Add an empty cell for it in the last line of the table, in order to fix the layout of the Totals.

Replace tab by spaces to be consistent

mod_status: note stopping procs in async info table

* add new column "stopping", denoting if a process is shutting down
* add additional "(old gen)", if a process is from before a graceful reload
* add counts of processes and stopping processes to summary line


Submitted by: sf, jailletc36, jailletc36, sf
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1772333 13f79535-47bb-0310-9956-ffa450edef68
      a489a662
    • Jim Jagielski's avatar
      Merge r1757061, r1770750 from trunk: · a9077d1c
      Jim Jagielski authored 
      ap_reclaim_child_processes() ignores its first argument

note this in the docs, add comment


ap_reclaim_child_processes(): Implement terminate immediately

The behavior for terminate == 1 was documented but not implemented. Do
that now.



Submitted by: sf
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1772332 13f79535-47bb-0310-9956-ffa450edef68
      a9077d1c
    • Jim Jagielski's avatar
      Merge r1597533, r1649491, r1665216, r1756553, r1756631, r1726675, r1718496,... · 92230a27
      Jim Jagielski authored 
      Merge r1597533, r1649491, r1665216, r1756553, r1756631, r1726675, r1718496, r1718476, r1747469 from trunk:

mod_cache: try to use the key of a possible open but stale cache entry
if we have one in cache_try_lock(). PR 50317

Submitted by: Ruediger Pluem


* modules/cache/mod_socache_memcache.c (socache_mc_store): Pass
  through expiration time.

Submitted by: Faidon Liambotis <paravoid debian.org>, jorton


* mod_cache: Preserve the Content-Type in case of 304 response.
304 does not contain Content-Type and mod_mime regenerates
the Content-Type based on the r->filename. This later leads to original
Content-Type to be lost (overwriten by whatever mod_mime generates).


mod_cache: Use the actual URI path and query-string for identifying the
cached entity (key), such that rewrites are taken into account when
running afterwards (CacheQuickHandler off).  PR 21935.
 


mod_cache: follow up to r1756553: log the real/actual cached URI (debug).



better s-maxage support
 
+  *) mod_cache: Consider Cache-Control: s-maxage in expiration
+     calculations.  [Eric Covener]
+
+  *) mod_cache: Allow caching of responses with an Expires header
+     in the past that also has Cache-Control: max-age or s-maxage.
+     PR55156. [Eric Covener]




remove dead code leftover from r1023387. 

Prior to this revision, there was an apr_atoi64 in this context.
Now, ap_cache_control() sets control.max_age (which is checked here) when
the maxage value was parsed OK.



duplicate debug-level AH00764 in the just-validated path.



Rename ap_casecmpstr[n]() to ap_cstr_casecmp[n](), update with APR doxygen
Submitted by: jkaluza, jorton, jkaluza, ylavic, ylavic, covener, covener, covener, wrowe
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1772331 13f79535-47bb-0310-9956-ffa450edef68
      92230a27
    • Jim Jagielski's avatar
      Merge r1702948, r1759415 from trunk: · 3d553bea
      Jim Jagielski authored 
      httpd compiles warning free on gcc and every new warning will be treated as an error, standard c-89 is enforced

http_config: follow up to r1702948: maybe unused, yet maybe usefull too.
Submitted by: icing, ylavic
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1772330 13f79535-47bb-0310-9956-ffa450edef68
      3d553bea
  3. 01 Dec, 2016 2 commits
  5. 30 Nov, 2016 1 commit
  7. 27 Nov, 2016 5 commits
  9. 23 Nov, 2016 3 commits
  11. 22 Nov, 2016 8 commits
  13. 21 Nov, 2016 9 commits
  15. 20 Nov, 2016 1 commit
  17. 19 Nov, 2016 3 commits
  19. 17 Nov, 2016 2 commits
  21. 16 Nov, 2016 1 commit
  23. 15 Nov, 2016 1 commit