Checkout Tools
  • last updated 10 mins ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Support IPv6-sized client strings in mod_status and mod_echo

trunk: http://svn.apache.org/r1837225

http://svn.apache.org/r1837366

2.4.x patch: http://home.apache.org/~jim/patches/client64v2.patch

+1: jim, icing (by inspection), minfrin

  1. … 7 more files in changeset.
mod_status: Use APR apr_time_as_msec() macro for

conversion from apr_time_t to milliseconds instead

of hard-coded division by 1000.

Backport of r1839780 from trunk.

Submitted by: rjung

Reviewed by: rjung, rpluem, jim

  1. … 2 more files in changeset.
mod_status: Add cumulated response duration time

in milliseconds.

Backport of remaining parts of r1837590 from trunk

(only html mode changes, auto parts were already

backported).

Submitted by: rjung

Reviewed by: rjung, jim, ylavic

  1. … 2 more files in changeset.
Fix unintended change to HTML server-status

format.

Followon to r1839533.

mod_status: Add cumulated response duration time

in milliseconds to auto mode.

Partial backport of r1839532 from trunk

(only auto mode changes, html parts not yet

backported).

Submitted by: rjung

Reviewed by: rjung, jim, ylavic

  1. … 6 more files in changeset.
mod_status: Cumulate CPU time of exited child

processes in the "cu" and "cs" values.

Add CPU time of the parent process to the

"c" and "s" values.

Backport of r1837595 from trunk.

Submitted by: rjung

Reviewed by: rjung, jim, ylavic

  1. … 7 more files in changeset.
mod_status: Complete the data shown for async

MPMs in "auto" mode. Added number of processes,

number of stopping processes and number

of busy and idle workers.

This changes only the key/value list of the

server-status "auto" output. The data is already

part of the "html" output.

Backport of r1837589 from trunk.

Submitted by: rjung

Reviewed by: rjung, jim, ylavic

  1. … 3 more files in changeset.
Merge r1738628, r1757009, r1756848, r1757029 from trunk:

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

  1. … 3 more files in changeset.
Merge r1757010, r1757011 from trunk:

Delay some memory allocation in order to save 272 bytes in the 'request' memory pool if mod_status handler is triggered and is not able to handle the request

Fix <p> tag closing syntax

Submitted by: jailletc36

Reviewed/backported by: jim

  1. … 2 more files in changeset.
merging pre_close_connection hook, prep_lingering_close and ap_update_child() additions from trunk
  1. … 8 more files in changeset.
Merge r1671396, r1672289, r1672453 from trunk:

Add more data to "?auto" view of server-status.

Although mod_status source code calls this the

"short_report", the docs and the API flag call

it "Machine Readable" resp. "STAT_OPT_AUTO".

So IMHO the data shown should be on par with

the html version.

Followon to r1671396:

Remove unwanted redundant output introduced

by that commit.

Followon to r1671396: add misiing newline in

new server-status output.

Submitted by: rjung

Reviewed/backported by: jim

  1. … 3 more files in changeset.
Merge 1610491 from trunk:

SECURITY (CVE-2014-0226): Fix a race condition in scoreboard handling,

which could lead to a heap buffer overflow. Thanks to Marek Kroemeke

working with HP's Zero Day Initiative for reporting this.

* include/scoreboard.h: Add ap_copy_scoreboard_worker.

* server/scoreboard.c (ap_copy_scoreboard_worker): New function.

* modules/generators/mod_status.c (status_handler): Use it.

* modules/lua/lua_request.c (lua_ap_scoreboard_worker): Likewise.

Reviewed by: trawick, jorton, covener, jim

Submitted by: jorton, covener

  1. … 6 more files in changeset.
Merge r1442865, r1442759, r1442326, r1442309, r1448171, r1418556, r1448453, r1425771, r1425772, r1425775 from trunk:

Change bzero/bcopy into memset/memcpy

PR 54346

Can't figure out why we allocate len+2 bytes here. Len+1 should be enough.

Fix valgrind warning about uninitialized memory in argument to semctl

PR: 53690

Submitted by: Mikhail T. <mi+apache aldan algebra com>

fix valgrind warnings about uninitialized memory in syscall arguments

This is useful info for mod_status ;)

Add some __attribute__ for automatic format checking.

Correct one catch in sed0.c.

Correct some spelling.

Replace strdup by ap_malloc to ensure a proper error message if out-of-memory.

While there, only allocate memory for the string part we actually use.

PR: 54345

Exit with error message if out of mem

htdbm, htpasswd: print error message if out of memory

PR: 54345

Submitted by: jailletc36, sf, sf, jim, jailletc36, minfrin, sf, sf, sf

Reviewed/backported by: jim

  1. … 19 more files in changeset.
this is broken... veto and pull out

  1. … 1 more file in changeset.
Merge r1417529 from trunk:

Add useful mod_status info... try to determine last time

a specific vhost was accessed/used.

Reviewed/backported by: jim

  1. … 2 more files in changeset.
Merge r1413732, r1418752:

various mods: host and URI escaping:

Be sure to escape potential troubled strings

add missing html escaping

Submitted by: jim, sf

Reviewed by: covener, minfrin, sf

  1. … 8 more files in changeset.
* core: Add in ap_get_sload() and ap_get_loadavg().

  1. … 7 more files in changeset.
Axe unnecessary trailing comma from server-status user output.

Backport of r1369904 from trunk.

Submitted by: trawick

Reviewed by: rjung, humbedooh

Backported by: rjung

  1. … 2 more files in changeset.
Backport r1209766, r1210252, r1210284:

Add lots of unique tags to error log messages

ssl_util.c: Downgrade some dynamic locking messages from level DEBUG

to TRACE1-3

  1. … 164 more files in changeset.