granicus.if.org Git - apache/log

]> granicus.if.org Git - apache/log

projects / apache / log

summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next

commit | commitdiff | tree

Stefan Fritsch [Sun, 9 Dec 2012 13:45:56 +0000 (13:45 +0000)]

Merge r1410681:

* mod_rewrite: PR53963: Ad an opt-in RewriteOption to control merging of RewriteBase
(This merge started happening in 2.4.0/2.2.23)

Submitted by: covener
Reviewed by: covener, minfrin, sf

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

commit | commitdiff | tree

Stefan Fritsch [Sun, 9 Dec 2012 13:41:05 +0000 (13:41 +0000)]

vote+promote

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

commit | commitdiff | tree

Stefan Fritsch [Sun, 9 Dec 2012 13:33:29 +0000 (13:33 +0000)]

Merge r1398970, r1407853, r1398480, r1398478, r1411862, r1397320:

    1398970: Use 'ap_strcasestr' instead of a strdup/str_tolower/strstr sequence
    1407853: cppCheck:  Suspicious condition.
    1398480: cppcheck: arrayIndexThenCheck - change the order of the tests in
             order to avoid a potential out-of-bound access.
    1398478: ccpcheck: duplicateExpression - 'vary_by_language' is tested twice
    1411862: Use apr_is_empty_table() instead of getting a table and checking the
             value of the 'nelts' field.
    1397320: remove extra ';'

Submitted by: jailletc36
Reviewed by: jailletc36, minfrin, sf

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

commit | commitdiff | tree

Stefan Fritsch [Sun, 9 Dec 2012 13:28:04 +0000 (13:28 +0000)]

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

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

commit | commitdiff | tree

Stefan Fritsch [Sun, 9 Dec 2012 13:20:13 +0000 (13:20 +0000)]

Merge r1389565, r1389566, r1389569:

    Allow for exposure of loadavg and server load via mod_headers

    Might as well show 'em all

    Document new mod_headers params: %l, %i, %b

Submitted by: jim
Reviewed by: jailletc36, druggeri, minfrin

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

commit | commitdiff | tree

Stefan Fritsch [Sun, 9 Dec 2012 13:15:02 +0000 (13:15 +0000)]

Merge r1359884:

    make varbuf functions treat AP_VARBUF_UNKNOWN consistently, improve docs

    ap_varbuf_pdup(): copying the whole buffer in case strlen ==
    AP_VARBUF_UNKNOWN does not make sense as the caller can not set
    the exact buffer size, only a minimum. No API change as previously
    the behavior with AP_VARBUF_UNKNOWN was undocumented.

    regsub_core(): Checking for vb->buf is useless, it cannot be NULL
    unless ap_varbuf_init has not been called.

    ap_varbuf_cfg_getline(): Initially, allocate enough memory to hold
    an empty line. If strlen == AP_VARBUF_UNKNOWN, use strlen(buf) instead
    of undefined behavior.

Reviewed by: jim, sf, minfrin

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

commit | commitdiff | tree

Graham Leggett [Sun, 9 Dec 2012 13:12:16 +0000 (13:12 +0000)]

Vote.

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

commit | commitdiff | tree

Stefan Fritsch [Sun, 9 Dec 2012 13:10:46 +0000 (13:10 +0000)]

Merge r1343109:

    Make ap_regcomp() return AP_REG_ESPACE if out of memory.  Make ap_pregcomp()
    abort if out of memory.

    This raises the minimum PCRE requirement to version 6.0, released in 2005.

Reviewed by: jim, sf, minfrin

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

commit | commitdiff | tree

Stefan Fritsch [Sun, 9 Dec 2012 13:06:03 +0000 (13:06 +0000)]

vote+promote

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

commit | commitdiff | tree

Stefan Fritsch [Sun, 9 Dec 2012 12:53:32 +0000 (12:53 +0000)]

vote + promote

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

commit | commitdiff | tree

Eric Covener [Sun, 9 Dec 2012 00:02:59 +0000 (00:02 +0000)]

update proposal

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

commit | commitdiff | tree

Graham Leggett [Sat, 8 Dec 2012 23:32:00 +0000 (23:32 +0000)]

Comment.

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

commit | commitdiff | tree

Graham Leggett [Sat, 8 Dec 2012 23:25:53 +0000 (23:25 +0000)]

Vote and promote.

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

commit | commitdiff | tree

Graham Leggett [Sat, 8 Dec 2012 23:15:16 +0000 (23:15 +0000)]

Vote.

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

commit | commitdiff | tree

Graham Leggett [Sat, 8 Dec 2012 23:04:03 +0000 (23:04 +0000)]

Vote.

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

commit | commitdiff | tree

Graham Leggett [Sat, 8 Dec 2012 22:59:22 +0000 (22:59 +0000)]

Vote and promote.

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

commit | commitdiff | tree

Graham Leggett [Sat, 8 Dec 2012 22:54:59 +0000 (22:54 +0000)]

Vote and promote.

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

commit | commitdiff | tree

Graham Leggett [Sat, 8 Dec 2012 22:49:30 +0000 (22:49 +0000)]

Vote.

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

commit | commitdiff | tree

Eric Covener [Sat, 8 Dec 2012 22:44:48 +0000 (22:44 +0000)]

propose recent trunk escaping revisions

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

commit | commitdiff | tree

Graham Leggett [Sat, 8 Dec 2012 18:04:34 +0000 (18:04 +0000)]

Address rjung's concern, reset the vote.

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

commit | commitdiff | tree

Graham Leggett [Sat, 8 Dec 2012 17:43:44 +0000 (17:43 +0000)]

Backport r1418703.
rpm: Remove stray references to the epoch variable.

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

commit | commitdiff | tree

Nilgun Belma Buguner [Sat, 8 Dec 2012 15:45:40 +0000 (15:45 +0000)]

update transformations.

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

commit | commitdiff | tree

Nilgun Belma Buguner [Sat, 8 Dec 2012 15:44:34 +0000 (15:44 +0000)]

update for sync with English docs.

Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by: Orhan Berent <berent belgeler.org>

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

commit | commitdiff | tree

Nilgun Belma Buguner [Sat, 8 Dec 2012 15:41:05 +0000 (15:41 +0000)]

fixed validation error

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

commit | commitdiff | tree

Graham Leggett [Sat, 8 Dec 2012 12:19:14 +0000 (12:19 +0000)]

Propose.

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

commit | commitdiff | tree

Lucien Gentis [Fri, 7 Dec 2012 11:35:14 +0000 (11:35 +0000)]

Updates.

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

commit | commitdiff | tree

Jim Jagielski [Thu, 6 Dec 2012 13:59:32 +0000 (13:59 +0000)]

Merge r1404653 from trunk:

Allow for setting of sticky session split char...
Bugz 53893

Reviewed/backported by: jim

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

commit | commitdiff | tree

Stefan Fritsch [Wed, 5 Dec 2012 23:04:38 +0000 (23:04 +0000)]

propose

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

commit | commitdiff | tree

Stefan Fritsch [Wed, 5 Dec 2012 22:12:13 +0000 (22:12 +0000)]

promote

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

commit | commitdiff | tree

Stefan Fritsch [Wed, 5 Dec 2012 22:11:25 +0000 (22:11 +0000)]

vote, comment

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

commit | commitdiff | tree

Jim Jagielski [Tue, 4 Dec 2012 13:57:55 +0000 (13:57 +0000)]

Note new stick-sep patch

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

commit | commitdiff | tree

Eric Covener [Tue, 4 Dec 2012 02:28:16 +0000 (02:28 +0000)]

Merge r1412278 from https://svn.apache.org/repos/asf/httpd/httpd/trunk/:

mod_dumpio: Correctly log large messages + style issues
PR 54179

Submitted by: Marek Wianecki
Reviewed by: jailletc36, sf, druggeri

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

commit | commitdiff | tree

Eric Covener [Tue, 4 Dec 2012 02:22:24 +0000 (02:22 +0000)]

Merge r1415023 from https://svn.apache.org/repos/asf/httpd/httpd/trunk/:

PR54223: 2.4 generates AH00554 when Include points to a directory with no wildcard.

r931435 refactored ap_process_resource_config() so it didn't read through
directories, but also changed a path non-fnmatch directories are passed
through to call ap_process_resource_config().

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

commit | commitdiff | tree

Eric Covener [Tue, 4 Dec 2012 02:20:17 +0000 (02:20 +0000)]

Merge r1415008, r1416150 from https://svn.apache.org/repos/asf/httpd/httpd/trunk/:

PR54222: catch invalid ServerTokens args

Submitted by: Jackie Zhang <jackie.qq.zhang gmail.com>
Reviewed/modified by: covener

Sort error message for ServerTokens by increasing verbosity. Add missing 'OS'
variant.

Remove some trailing whitespace.

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

commit | commitdiff | tree

Eric Covener [Tue, 4 Dec 2012 02:15:17 +0000 (02:15 +0000)]

promote

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

commit | commitdiff | tree

Daniel Ruggeri [Tue, 4 Dec 2012 00:36:36 +0000 (00:36 +0000)]

A few votes

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

commit | commitdiff | tree

Christophe Jaillet [Mon, 3 Dec 2012 22:33:54 +0000 (22:33 +0000)]

Proposal

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

commit | commitdiff | tree

Stefan Fritsch [Mon, 3 Dec 2012 21:22:17 +0000 (21:22 +0000)]

fix indent

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

commit | commitdiff | tree

Jim Jagielski [Mon, 3 Dec 2012 16:43:47 +0000 (16:43 +0000)]

Merge r1398066 from trunk:

FallbackResource : Support for the 'disabled' argument

Submitted by: gryzor
Reviewed/backported by: jim

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

commit | commitdiff | tree

Jim Jagielski [Mon, 3 Dec 2012 16:37:23 +0000 (16:37 +0000)]

Merge r1410954 from trunk:

Don't log a spurious "-" if a request has been rejected
before mod_log_forensic could attach its id to it.

http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=693292

Submitted by: sf
Reviewed/backported by: jim

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

commit | commitdiff | tree

Jim Jagielski [Mon, 3 Dec 2012 16:35:52 +0000 (16:35 +0000)]

Merge r1408958, r1408961, r1409170 from trunk:

mod_session_dbd: fix a segmentation fault in the function dbd_remove.
The segmentation fault is caused by an uninitialized function pointer session_dbd_acquire_fn.
PR 53452

formatting: space vs tab

Axed C++ comments.

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

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

commit | commitdiff | tree

Jim Jagielski [Mon, 3 Dec 2012 16:33:42 +0000 (16:33 +0000)]

Merge r1337344, r1378178, r1397636, r1398025, r1398040, r1398481, r1407004, r1407006, r1407088, r1407528 from trunk:

* support/suexec.c: Add gcc format-string attributes to logging
  functions.
  (main): Always print uid/gid as unsigned long, and cast to avoid
  warnings (which somewhat defeats the point of the format string
  attrs, but is necessary since the size of gid/uid varies).

remove an unnecessary check in a nest loop of ap_create_environment()

s/;;/;/

No need to test for NULL before calling apr_pstrdup.

No need it apr_pcalloc here, the memory is fully initialized the line just after

cppCheck: unreadVariable - 'serviceFlag' is not used in the function, so remove it

Remove unused code. "Next week" hasn't happened in the last 10 years or so.

log client error at level debug, log broken Host header value

remove some more old unused code

remove obsolete comment from 1.3 days

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

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

commit | commitdiff | tree

Jim Jagielski [Mon, 3 Dec 2012 16:21:17 +0000 (16:21 +0000)]

promotes

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

commit | commitdiff | tree

Jim Jagielski [Mon, 3 Dec 2012 16:16:04 +0000 (16:16 +0000)]

votes

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

commit | commitdiff | tree

Jim Jagielski [Mon, 3 Dec 2012 16:14:19 +0000 (16:14 +0000)]

propose release timeline... kinda

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

commit | commitdiff | tree

Joe Orton [Mon, 3 Dec 2012 09:54:49 +0000 (09:54 +0000)]

Merged one.

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

commit | commitdiff | tree

Joe Orton [Mon, 3 Dec 2012 09:54:13 +0000 (09:54 +0000)]

Merge 1409726 from trunk:

* support/rotatelogs.c (post_rotate): Really omit the second arg when
invoking a post-rotate program, rather than passing an empty arg.
(Fixes to code match desired&documented behaviour.)

Reviewed by: jorton, jim, sf

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

commit | commitdiff | tree

Stefan Fritsch [Sun, 2 Dec 2012 14:17:24 +0000 (14:17 +0000)]

retract vote, comment

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

commit | commitdiff | tree

Stefan Fritsch [Sun, 2 Dec 2012 14:12:58 +0000 (14:12 +0000)]

vote+promote

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

commit | commitdiff | tree

Eric Covener [Sun, 2 Dec 2012 14:08:08 +0000 (14:08 +0000)]

add sf's revision, no votes invalidated.

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

commit | commitdiff | tree

Stefan Fritsch [Sun, 2 Dec 2012 14:06:15 +0000 (14:06 +0000)]

vote+promote

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

commit | commitdiff | tree

Stefan Fritsch [Sun, 2 Dec 2012 11:39:56 +0000 (11:39 +0000)]

vote/comment

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

commit | commitdiff | tree

Stefan Fritsch [Sun, 2 Dec 2012 11:14:40 +0000 (11:14 +0000)]

promote

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

commit | commitdiff | tree

Stefan Fritsch [Sun, 2 Dec 2012 11:13:35 +0000 (11:13 +0000)]

vote, comment

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

commit | commitdiff | tree

Stefan Fritsch [Sat, 1 Dec 2012 19:56:48 +0000 (19:56 +0000)]

vote

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

commit | commitdiff | tree

Lucien Gentis [Sat, 1 Dec 2012 14:28:42 +0000 (14:28 +0000)]

Updates.

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

commit | commitdiff | tree

Igor Galić [Sat, 1 Dec 2012 09:56:51 +0000 (09:56 +0000)]

xforms

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

commit | commitdiff | tree

Igor Galić [Sat, 1 Dec 2012 09:53:54 +0000 (09:53 +0000)]

merge r1415960

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

commit | commitdiff | tree

Igor Galić [Fri, 30 Nov 2012 09:11:39 +0000 (09:11 +0000)]

xforms

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

commit | commitdiff | tree

Igor Galić [Fri, 30 Nov 2012 09:09:33 +0000 (09:09 +0000)]

merge r1415549

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

commit | commitdiff | tree

Igor Galić [Thu, 29 Nov 2012 08:40:12 +0000 (08:40 +0000)]

xforms

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

commit | commitdiff | tree

Igor Galić [Thu, 29 Nov 2012 08:19:11 +0000 (08:19 +0000)]

merge r1415075

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

commit | commitdiff | tree

Eric Covener [Thu, 29 Nov 2012 01:41:35 +0000 (01:41 +0000)]

question myself on startup failure

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

commit | commitdiff | tree

Eric Covener [Thu, 29 Nov 2012 01:38:58 +0000 (01:38 +0000)]

propose Include /path/to/dir fix

back-to-back valid PR's submitted in the same minute.

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

commit | commitdiff | tree

Jim Jagielski [Wed, 28 Nov 2012 16:34:25 +0000 (16:34 +0000)]

Some backport votes

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

commit | commitdiff | tree

Jim Jagielski [Wed, 28 Nov 2012 16:33:18 +0000 (16:33 +0000)]

Merge r1374874 from trunk:

WinNT MPM: Fix thread-safety issue in worker_main().  All
workers were allocating from pchild without holding '
child_lock.  Allocate from ptrans instead.

Related to: PR 52196

The reporter suggests that the apr_thread_t for r->connection->current_thread
should have a unique pool.  This revision handles that for WinNT MPM,
but not for other MPMs.

Submitted by: trawick
Reviewed/backported by: jim

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

commit | commitdiff | tree

Vincent Deffontaines [Tue, 27 Nov 2012 21:48:12 +0000 (21:48 +0000)]

Zombie translations must die now.

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

commit | commitdiff | tree

Christophe Jaillet [Tue, 27 Nov 2012 21:34:37 +0000 (21:34 +0000)]

Proposal

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

commit | commitdiff | tree

Igor Galić [Tue, 27 Nov 2012 10:30:25 +0000 (10:30 +0000)]

merge r1414094

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

commit | commitdiff | tree

Vincent Deffontaines [Sun, 25 Nov 2012 20:52:23 +0000 (20:52 +0000)]

Adding .fr translation for a number of program documentations

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

commit | commitdiff | tree

Lucien Gentis [Sat, 24 Nov 2012 13:40:08 +0000 (13:40 +0000)]

Update.

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

commit | commitdiff | tree

Vincent Deffontaines [Fri, 23 Nov 2012 18:56:05 +0000 (18:56 +0000)]

Adding .fr translation for some support program documentation

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

commit | commitdiff | tree

Vincent Deffontaines [Fri, 23 Nov 2012 17:45:29 +0000 (17:45 +0000)]

Adding two documents translated to french

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

commit | commitdiff | tree

Rich Bowen [Tue, 20 Nov 2012 02:06:55 +0000 (02:06 +0000)]

Update

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

commit | commitdiff | tree

Rich Bowen [Tue, 20 Nov 2012 02:05:12 +0000 (02:05 +0000)]

Ensure that mod_ssl is loaded in the SSL example

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

commit | commitdiff | tree

Christophe Jaillet [Mon, 19 Nov 2012 21:36:19 +0000 (21:36 +0000)]

Vote

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

commit | commitdiff | tree

Stefan Fritsch [Mon, 19 Nov 2012 20:02:52 +0000 (20:02 +0000)]

vote, propose

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

commit | commitdiff | tree

Christophe Jaillet [Sun, 18 Nov 2012 18:09:35 +0000 (18:09 +0000)]

propose r1408958 (+ style issue) backport

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

commit | commitdiff | tree

Lucien Gentis [Sun, 18 Nov 2012 14:43:04 +0000 (14:43 +0000)]

Update.

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

commit | commitdiff | tree

Jim Jagielski [Sun, 18 Nov 2012 13:19:00 +0000 (13:19 +0000)]

bump minor

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

commit | commitdiff | tree

Christophe Jaillet [Sun, 18 Nov 2012 07:47:35 +0000 (07:47 +0000)]

Typo in comment (r1407526 in trunk)

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

commit | commitdiff | tree

Christophe Jaillet [Sun, 18 Nov 2012 07:41:57 +0000 (07:41 +0000)]

Typo in comment (r1374856 in trunk)

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

commit | commitdiff | tree

Christophe Jaillet [Sun, 18 Nov 2012 07:17:09 +0000 (07:17 +0000)]

Backport proposal for small things to keep 2.4.x in line with trunk as much as possible.
Cumulative patch available and tested.

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

commit | commitdiff | tree

Eric Covener [Sat, 17 Nov 2012 03:03:33 +0000 (03:03 +0000)]

add rewritebase proposal

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

commit | commitdiff | tree

Rich Bowen [Sat, 17 Nov 2012 02:41:42 +0000 (02:41 +0000)]

Rebuild

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

commit | commitdiff | tree

Rich Bowen [Sat, 17 Nov 2012 02:40:25 +0000 (02:40 +0000)]

Remove a silly paragraph that recommends doing something stupid.

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

commit | commitdiff | tree

Eric Covener [Sat, 17 Nov 2012 02:20:43 +0000 (02:20 +0000)]

vote/promote

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

commit | commitdiff | tree

Jim Jagielski [Thu, 15 Nov 2012 19:02:47 +0000 (19:02 +0000)]

Found a couple more trunk fixes that were "forgotten" to
be backported...

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

commit | commitdiff | tree

Jim Jagielski [Thu, 15 Nov 2012 18:49:17 +0000 (18:49 +0000)]

* core: Add in ap_get_sload() and ap_get_loadavg().

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

commit | commitdiff | tree

Jim Jagielski [Thu, 15 Nov 2012 18:38:51 +0000 (18:38 +0000)]

promote

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

commit | commitdiff | tree

Joe Orton [Thu, 15 Nov 2012 13:50:36 +0000 (13:50 +0000)]

Pushed one (sorry for that screwup, all LDAP-on-Windows users), add one.

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

commit | commitdiff | tree

Joe Orton [Thu, 15 Nov 2012 13:47:46 +0000 (13:47 +0000)]

Merge 1408402 from trunk:

followup to r1348036, MSSDK's WinLdap.h uses an enum for LDAP_* status codes, so the block is not included

Submitted by: covener
Reviewed by: covener, trawick, igalic

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

commit | commitdiff | tree

Igor Galić [Wed, 14 Nov 2012 16:29:17 +0000 (16:29 +0000)]

easy votes

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

commit | commitdiff | tree

Jim Jagielski [Tue, 13 Nov 2012 14:21:34 +0000 (14:21 +0000)]

Merge r1399708 from trunk:

only write the first len chars to syslog, as the buffer may have additional
text added speculatively

Submitted by: trawick
Reviewed/backported by: jim

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

commit | commitdiff | tree

Jim Jagielski [Tue, 13 Nov 2012 14:20:20 +0000 (14:20 +0000)]

Merge r1397172 from trunk:

"Iterate" directives: Report an error if no arguments are provided.

Submitted by: trawick
Reviewed/backported by: jim

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

commit | commitdiff | tree

Christophe Jaillet [Mon, 12 Nov 2012 22:07:00 +0000 (22:07 +0000)]

Vote, promote

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

commit | commitdiff | tree

Jeff Trawick [Mon, 12 Nov 2012 20:01:25 +0000 (20:01 +0000)]

+1 for MS SDK fix

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

commit | commitdiff | tree

Eric Covener [Mon, 12 Nov 2012 18:59:20 +0000 (18:59 +0000)]

propose LDAP_UNAVAILABLE windows fix

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

commit | commitdiff | tree

Jim Jagielski [Mon, 12 Nov 2012 14:19:00 +0000 (14:19 +0000)]

Merge r1407965 from trunk:

Replace an incorrect #if by the correct corresponding #if defined(...)

PR 54133 reported by Teodor Milkov ()
Submitted by: jailletc36
Reviewed/backported by: jim

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

commit | commitdiff | tree

Jim Jagielski [Mon, 12 Nov 2012 14:18:07 +0000 (14:18 +0000)]

Promote and vote

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

Unnamed repository; edit this file 'description' to name the repository.