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

Jim Jagielski [Sun, 5 Jan 2014 16:15:38 +0000 (16:15 +0000)]

Merge r1551714 from trunk:

Avoid sending back uninitialized memory, use 'ftpmessage' in order to have something meaningful instead.

Save 8k of stack by the same time.
Submitted by: jailletc36
Reviewed/backported by: jim

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

commit | commitdiff | tree

Jim Jagielski [Sun, 5 Jan 2014 16:15:08 +0000 (16:15 +0000)]

Merge r1552227 from trunk:

Remove <Proxy ~ wildcard-url> syntax which:
   - is equivalent to <ProxyMatch wildcard-url>
   - has never been documented
   - incorrectly checks parameters (!cmd->path should be !cmd->path[0])
   - is buggy (! is missing in front of strncasecmp)
Submitted by: jailletc36
Reviewed/backported by: jim

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

commit | commitdiff | tree

Jim Jagielski [Sun, 5 Jan 2014 16:14:26 +0000 (16:14 +0000)]

Merge r1554300, r1554301, r1554994, r1555266 from trunk:

core: Support named groups and backreferences within the LocationMatch,
DirectoryMatch, FilesMatch and ProxyMatch directives.

Documentation for the support of named groups and backreferences.

c89 fix

Add a "MATCH_" prefix to variables set within
LocationMatch/DirectoryMatch/FilesMatch.

Submitted by: minfrin, covener, minfrin
Reviewed/backported by: jim

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

commit | commitdiff | tree

Jim Jagielski [Sun, 5 Jan 2014 16:13:20 +0000 (16:13 +0000)]

Merge r1554195 from trunk:

mod_authz_user: Support the expression parser within the require directives.

Submitted by: minfrin
Reviewed/backported by: jim

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

commit | commitdiff | tree

Jim Jagielski [Sun, 5 Jan 2014 16:12:20 +0000 (16:12 +0000)]

Merge r1554188 from trunk:

mod_authnz_host: Support the expression parser within the require directives.

Submitted by: minfrin
Reviewed/backported by: jim

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

commit | commitdiff | tree

Jim Jagielski [Sun, 5 Jan 2014 16:11:44 +0000 (16:11 +0000)]

Merge r1554175, r1554184 from trunk:

mod_authnz_groupfile: Support the expression parser within the require directives.

Pass the correct pointer that made it past the test suite.

Submitted by: minfrin
Reviewed/backported by: jim

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

commit | commitdiff | tree

Stefan Fritsch [Sun, 5 Jan 2014 16:11:29 +0000 (16:11 +0000)]

xforms

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

commit | commitdiff | tree

Jim Jagielski [Sun, 5 Jan 2014 16:10:54 +0000 (16:10 +0000)]

Merge r1554170, r1554181 from trunk:

mod_authnz_dbm: Support the expression parser within the require directives.

Pass the correct pointer that made it past the test suite.

Submitted by: minfrin
Reviewed/backported by: jim

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

commit | commitdiff | tree

Jim Jagielski [Sun, 5 Jan 2014 16:10:09 +0000 (16:10 +0000)]

Merge r1554168, r1554176 from trunk:

mod_authnz_dbd: Support the expression parser within the require directives.

Pass the correct pointer that made it past the test suite.

Submitted by: minfrin
Reviewed/backported by: jim

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

commit | commitdiff | tree

Jim Jagielski [Sun, 5 Jan 2014 16:09:07 +0000 (16:09 +0000)]

Merge r1554161 from trunk:

mod_authnz_ldap: Support the expression parser within the require
directives.

Submitted by: minfrin
Reviewed/backported by: jim

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

commit | commitdiff | tree

Stefan Fritsch [Sun, 5 Jan 2014 16:06:53 +0000 (16:06 +0000)]

Merge r1554276, r1554281 from trunk:

    digest auth is only marginally more secure than basic auth.
    Adjust the docs to today's reality.

    mention insecure password storage as pointed out by Graham

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

commit | commitdiff | tree

Jim Jagielski [Sun, 5 Jan 2014 16:05:08 +0000 (16:05 +0000)]

ipromote!

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

commit | commitdiff | tree

Jim Jagielski [Sun, 5 Jan 2014 16:04:19 +0000 (16:04 +0000)]

ivote!

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

commit | commitdiff | tree

Stefan Fritsch [Sun, 5 Jan 2014 16:02:48 +0000 (16:02 +0000)]

propose

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

commit | commitdiff | tree

Kaspar Brand [Sun, 5 Jan 2014 08:46:55 +0000 (08:46 +0000)]

propose a couple of mod_ssl backports

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

commit | commitdiff | tree

Kaspar Brand [Sun, 5 Jan 2014 08:37:21 +0000 (08:37 +0000)]

Complement to r1542327 (Streamline and improve ephemeral key handling):
the change to acinclude.m4 (part of r1527294) was left out from the
backport proposal by mistake.

Originally proposed by: kbrand. Reviewed by: jim, jorton (cf. r1542297).

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

commit | commitdiff | tree

Eric Covener [Sat, 4 Jan 2014 17:41:08 +0000 (17:41 +0000)]

exercise my rights as a 'merican

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

commit | commitdiff | tree

Lucien Gentis [Sat, 4 Jan 2014 16:36:55 +0000 (16:36 +0000)]

Updates.

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

commit | commitdiff | tree

Graham Leggett [Fri, 3 Jan 2014 22:28:58 +0000 (22:28 +0000)]

Add "MATCH_" prefix to the proposal, add covener's fix, reset the vote.

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

commit | commitdiff | tree

Christophe Jaillet [Fri, 3 Jan 2014 20:45:28 +0000 (20:45 +0000)]

2 proposals

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

commit | commitdiff | tree

Eric Covener [Fri, 3 Jan 2014 15:03:47 +0000 (15:03 +0000)]

Merge r1555116 from trunk:

emphasize that this is mostly just AAA checks and not the status
code of the handler. PR21828 and various dups.

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

commit | commitdiff | tree

Jim Jagielski [Fri, 3 Jan 2014 14:48:11 +0000 (14:48 +0000)]

ivote!

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

commit | commitdiff | tree

Daniel Gruno [Fri, 3 Jan 2014 12:20:13 +0000 (12:20 +0000)]

mod_lua: Detect "All" or "None" before putting together a potentially blank (or static) string.

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

commit | commitdiff | tree

Eric Covener [Fri, 3 Jan 2014 02:31:21 +0000 (02:31 +0000)]

add tweak

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

commit | commitdiff | tree

Eric Covener [Fri, 3 Jan 2014 02:29:39 +0000 (02:29 +0000)]

propose fix for AuthnProviderAlias providers in VH context

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

commit | commitdiff | tree

Rich Bowen [Thu, 2 Jan 2014 18:04:43 +0000 (18:04 +0000)]

Oops, missed one. s/2013/2014/

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

commit | commitdiff | tree

Rich Bowen [Thu, 2 Jan 2014 18:02:15 +0000 (18:02 +0000)]

s/2013/2014/

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

commit | commitdiff | tree

Rich Bowen [Thu, 2 Jan 2014 17:58:33 +0000 (17:58 +0000)]

s/2013/2014/

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

commit | commitdiff | tree

Rich Bowen [Thu, 2 Jan 2014 17:53:59 +0000 (17:53 +0000)]

Add BitNami to binaries list

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

commit | commitdiff | tree

Jim Jagielski [Thu, 2 Jan 2014 13:34:35 +0000 (13:34 +0000)]

ivote!

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

commit | commitdiff | tree

André Malo [Tue, 31 Dec 2013 13:11:44 +0000 (13:11 +0000)]

update transformation

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

commit | commitdiff | tree

André Malo [Tue, 31 Dec 2013 13:07:20 +0000 (13:07 +0000)]

validate.

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

commit | commitdiff | tree

André Malo [Tue, 31 Dec 2013 13:06:15 +0000 (13:06 +0000)]

validate. properties.

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

commit | commitdiff | tree

Graham Leggett [Mon, 30 Dec 2013 20:11:15 +0000 (20:11 +0000)]

Propose.

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

commit | commitdiff | tree

Jim Jagielski [Mon, 30 Dec 2013 13:29:45 +0000 (13:29 +0000)]

Merge r1488492, r1542533, r1543020 from trunk:

Check if malloc succeeded
PR54344 [Bill Parker, wp02855 gmail com]

Check all memory allocations and abort on failure

follow-up to r1542533:

fix format string (unsigned vs. size_t)

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

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

commit | commitdiff | tree

Jim Jagielski [Mon, 30 Dec 2013 13:28:34 +0000 (13:28 +0000)]

vote (by inspection)

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

commit | commitdiff | tree

Graham Leggett [Mon, 30 Dec 2013 12:08:09 +0000 (12:08 +0000)]

Propose.

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

commit | commitdiff | tree

Graham Leggett [Mon, 30 Dec 2013 11:54:19 +0000 (11:54 +0000)]

Propose.

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

commit | commitdiff | tree

Graham Leggett [Mon, 30 Dec 2013 11:52:49 +0000 (11:52 +0000)]

Propose.

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

commit | commitdiff | tree

Graham Leggett [Mon, 30 Dec 2013 10:53:56 +0000 (10:53 +0000)]

Update the proposal.

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

commit | commitdiff | tree

Graham Leggett [Mon, 30 Dec 2013 10:23:14 +0000 (10:23 +0000)]

Update the proposal.

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

commit | commitdiff | tree

Graham Leggett [Mon, 30 Dec 2013 09:54:21 +0000 (09:54 +0000)]

Propose.

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

commit | commitdiff | tree

Graham Leggett [Mon, 30 Dec 2013 09:41:34 +0000 (09:41 +0000)]

Propose.

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

commit | commitdiff | tree

Graham Leggett [Mon, 30 Dec 2013 07:58:14 +0000 (07:58 +0000)]

Propose.

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

commit | commitdiff | tree

Eric Covener [Sun, 29 Dec 2013 15:49:35 +0000 (15:49 +0000)]

vote/promote

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

commit | commitdiff | tree

Jim Jagielski [Sun, 29 Dec 2013 15:47:32 +0000 (15:47 +0000)]

vote

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

commit | commitdiff | tree

Graham Leggett [Thu, 26 Dec 2013 18:25:04 +0000 (18:25 +0000)]

mod_proxy_http: Core dumped under high load. PR 50335

trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1534321
http://svn.apache.org/viewvc?view=revision&revision=1550061

Submitted by: Jan Kaluza <jkaluza redhat.com>
Reviewed by: jim, jorton, minfrin

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

commit | commitdiff | tree

Graham Leggett [Thu, 26 Dec 2013 18:18:41 +0000 (18:18 +0000)]

Vote, promote.

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

commit | commitdiff | tree

Graham Leggett [Thu, 26 Dec 2013 18:08:28 +0000 (18:08 +0000)]

* easy proposals to synch 2.4.x and trunk
  - log.c: avoid needless apr_pstrdup()
  - Use apr_pstrmemdup instead of apr_pstrndup when this is safe.
  - Use apr_pstrmemdup instead of apr_pstrndup when this is safe.
  - Remove redundant check
  - 'ap_getword_conf' does not return NULL but an empty string
  - Ease logic around 'ap_getword_conf' and drop useless line of code.
  - 'ap_getword_conf' can not return NULL
  - 'ap_getword_conf' can not return NULL
  - Remove redundant check (already performed the line before)
  - Use 'apr_pstrmemdup' instead of 'apr_pstrndup' when applicable
trunk patches:
  - https://svn.apache.org/viewvc?view=revision&revision=1532122
  - https://svn.apache.org/viewvc?view=revision&revision=1549676
  - https://svn.apache.org/viewvc?view=revision&revision=1549680
  - https://svn.apache.org/viewvc?view=revision&revision=1550651
  - https://svn.apache.org/viewvc?view=revision&revision=1551005
  - https://svn.apache.org/viewvc?view=revision&revision=1551009
  - https://svn.apache.org/viewvc?view=revision&revision=1551010
  - https://svn.apache.org/viewvc?view=revision&revision=1551011
  - https://svn.apache.org/viewvc?view=revision&revision=1551012
  - https://svn.apache.org/viewvc?view=revision&revision=1551013
2.4.x patches: trunk patches work
               http://people.apache.org/~jim/patches/ez-2.4-v2.patch
+1: jailletc36, jim, minfrin

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

commit | commitdiff | tree

Graham Leggett [Thu, 26 Dec 2013 18:06:22 +0000 (18:06 +0000)]

Vote, promote.

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

commit | commitdiff | tree

Graham Leggett [Thu, 26 Dec 2013 18:01:53 +0000 (18:01 +0000)]

* easy proposals to synch 2.4.x and trunk
  - Use apr_file_printf(... "%pm"...) instead of explicit call to apr_strerror
  - remove unused variables
  - axe some useless assignments (clang scan-build)
  - Remove useless apr_pstrdup as done for other mod_auth modules in r1026660
  - Remove unused APXS setting from template for generated Makefile

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

commit | commitdiff | tree

Graham Leggett [Thu, 26 Dec 2013 17:59:15 +0000 (17:59 +0000)]

Vote, promote.

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

commit | commitdiff | tree

Graham Leggett [Thu, 26 Dec 2013 17:55:04 +0000 (17:55 +0000)]

Comment.

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

commit | commitdiff | tree

Graham Leggett [Thu, 26 Dec 2013 17:16:34 +0000 (17:16 +0000)]

Backport 1553514:
rpm spec file: Ensure that apr-util-ldap is installed when mod_authnz_ldap
is installed.

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

commit | commitdiff | tree

Vincent Deffontaines [Thu, 26 Dec 2013 16:12:03 +0000 (16:12 +0000)]

[2.4][doc] mod_dir.xml r1553503 backport - Document 3xx DirectoryIndexRedirect codes

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

commit | commitdiff | tree

Vincent Deffontaines [Thu, 26 Dec 2013 16:01:05 +0000 (16:01 +0000)]

[2.4][doc] mod_dir.xml r1553502 backport - Document 3xx DirectoryIndexRedirect codes

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

commit | commitdiff | tree

André Malo [Thu, 26 Dec 2013 15:23:06 +0000 (15:23 +0000)]

fixup properties

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

commit | commitdiff | tree

André Malo [Thu, 26 Dec 2013 15:17:50 +0000 (15:17 +0000)]

update transformation

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

commit | commitdiff | tree

Eric Covener [Tue, 24 Dec 2013 20:04:48 +0000 (20:04 +0000)]

propose non-MSSDK windows fix

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

commit | commitdiff | tree

Eric Covener [Tue, 24 Dec 2013 16:41:34 +0000 (16:41 +0000)]

merge comments into propsoal, reset vote but include Jeff.

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

commit | commitdiff | tree

Eric Covener [Mon, 23 Dec 2013 13:32:38 +0000 (13:32 +0000)]

propose two small patches that didn't make it to 2.4 yet

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

commit | commitdiff | tree

Rainer Jung [Wed, 18 Dec 2013 15:21:28 +0000 (15:21 +0000)]

Remove proposal obsoleted by r1551932.

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

commit | commitdiff | tree

Eric Covener [Wed, 18 Dec 2013 15:03:19 +0000 (15:03 +0000)]

Merge r1551968 from trunk:

get arpa/inet.h from apr_want.h for htons where applicable

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

commit | commitdiff | tree

Jim Jagielski [Wed, 18 Dec 2013 13:10:23 +0000 (13:10 +0000)]

Merge r1493921, r1515162 from trunk:

mod_socache_shmcb.c: Remove arbitrary restriction on shared memory size
previously limited to 64MB.

Limit SHMCB_MAX_SIZE to min(UINT_MAX, APR_SIZE_MAX) to match the current code

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

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

commit | commitdiff | tree

Jim Jagielski [Wed, 18 Dec 2013 13:07:32 +0000 (13:07 +0000)]

Promote...

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

commit | commitdiff | tree

Christophe Jaillet [Wed, 18 Dec 2013 05:34:18 +0000 (05:34 +0000)]

Remove a 1 empty line difference between trunk and 2.4.x that could break backport of r1551714.

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

commit | commitdiff | tree

Joe Orton [Tue, 17 Dec 2013 16:17:36 +0000 (16:17 +0000)]

Vote.

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

commit | commitdiff | tree

Jim Jagielski [Mon, 16 Dec 2013 15:57:51 +0000 (15:57 +0000)]

and vote on the ez ones

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

commit | commitdiff | tree

Jim Jagielski [Mon, 16 Dec 2013 15:57:09 +0000 (15:57 +0000)]

2 combned patches for ease of viewing/voting

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

commit | commitdiff | tree

Jim Jagielski [Mon, 16 Dec 2013 15:17:49 +0000 (15:17 +0000)]

Extend reason for patch

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

commit | commitdiff | tree

Christophe Jaillet [Sun, 15 Dec 2013 14:03:47 +0000 (14:03 +0000)]

A set of easy proposals

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

commit | commitdiff | tree

Lucien Gentis [Sat, 14 Dec 2013 12:42:22 +0000 (12:42 +0000)]

Update.

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

commit | commitdiff | tree

Christophe Jaillet [Fri, 13 Dec 2013 19:57:56 +0000 (19:57 +0000)]

s/equivalant/equivalent/ in comments

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

commit | commitdiff | tree

Daniel Gruno [Fri, 13 Dec 2013 11:02:59 +0000 (11:02 +0000)]

xforms

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

commit | commitdiff | tree

Daniel Gruno [Fri, 13 Dec 2013 10:59:10 +0000 (10:59 +0000)]

s/password/pass/

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

commit | commitdiff | tree

Daniel Gruno [Fri, 13 Dec 2013 10:49:35 +0000 (10:49 +0000)]

Use a better example for a connection string (one with both username and password)

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

commit | commitdiff | tree

Christophe Jaillet [Fri, 13 Dec 2013 06:11:00 +0000 (06:11 +0000)]

s/ip/IP/ in comments

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

commit | commitdiff | tree

Jim Jagielski [Thu, 12 Dec 2013 15:47:39 +0000 (15:47 +0000)]

backport proposal

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

commit | commitdiff | tree

Daniel Ruggeri [Thu, 5 Dec 2013 19:09:44 +0000 (19:09 +0000)]

An overdue vote. Thanks, Jim

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

commit | commitdiff | tree

Jim Jagielski [Mon, 2 Dec 2013 12:18:19 +0000 (12:18 +0000)]

Merge r1544820 from trunk:

mod_lua: Fix compiler warning by using correct
APR_SIZE_T_FMT and APR_OFF_T_FMT format macro
in debug logging.

Submitted by: rjung
Reviewed/backported by: jim

NOTE: Not sure about CHANGES... is there a BUGZ on this?
In general, CHANGES is for userland visible changes or
BUGZ bug fixes, and not sure if this really applies
here. But it's OK if someone wants to add something
to CHANGES.

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

commit | commitdiff | tree

Jeff Trawick [Mon, 2 Dec 2013 12:12:16 +0000 (12:12 +0000)]

vote/promote

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

commit | commitdiff | tree

Christophe Jaillet [Sun, 1 Dec 2013 08:12:16 +0000 (08:12 +0000)]

Vote + easy proposal to synch with trunk

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

commit | commitdiff | tree

Lucien Gentis [Sat, 30 Nov 2013 16:54:58 +0000 (16:54 +0000)]

Updates.

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

commit | commitdiff | tree

Daniel Gruno [Fri, 29 Nov 2013 12:16:28 +0000 (12:16 +0000)]

Adding missing changelog entries for mod_lua.

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

commit | commitdiff | tree

Eric Covener [Fri, 29 Nov 2013 10:56:53 +0000 (10:56 +0000)]

Merge r1546534 from trunk:

compat note for AuthLDAPBindPassword exec:

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

commit | commitdiff | tree

Gregg Lewis Smith [Thu, 28 Nov 2013 18:30:20 +0000 (18:30 +0000)]

List all APR dependencies
PR 54739

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

commit | commitdiff | tree

Jim Jagielski [Mon, 25 Nov 2013 14:11:44 +0000 (14:11 +0000)]

Note released date

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

commit | commitdiff | tree

Eric Covener [Sun, 24 Nov 2013 17:32:35 +0000 (17:32 +0000)]

Merge r1545015 from trunk:

drop a caveat with an outdated example, there is now "reallyall" documented above.

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

commit | commitdiff | tree

Rainer Jung [Sat, 23 Nov 2013 17:01:55 +0000 (17:01 +0000)]

Add 1.5 proposals and remove one proposed
backport revision because it is already in 2.4.

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

commit | commitdiff | tree

Lucien Gentis [Sat, 23 Nov 2013 16:00:19 +0000 (16:00 +0000)]

Updates.

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

commit | commitdiff | tree

Jeff Trawick [Fri, 22 Nov 2013 21:02:20 +0000 (21:02 +0000)]

add CHANGES entry for event's apr_atomic sanity check added
to the 2.4.x branch in r1542560

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

commit | commitdiff | tree

Eric Covener [Fri, 22 Nov 2013 18:29:57 +0000 (18:29 +0000)]

Merge r1544629, r1544626 from trunk:

give a hint about the requirements for <If

include <if> in the list of things that are directory contexts before
clicking through to the sections.html

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

commit | commitdiff | tree

Nilgun Belma Buguner [Fri, 22 Nov 2013 00:55:45 +0000 (00:55 +0000)]

update transformations.

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

commit | commitdiff | tree

Nilgun Belma Buguner [Fri, 22 Nov 2013 00:44:31 +0000 (00:44 +0000)]

update for sync with English docs.

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

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

commit | commitdiff | tree

Nilgun Belma Buguner [Fri, 22 Nov 2013 00:41:45 +0000 (00:41 +0000)]

fixed validation errors

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

commit | commitdiff | tree

Jeff Trawick [Fri, 22 Nov 2013 00:21:06 +0000 (00:21 +0000)]

r1542330 merged a trunk change to 2.4.x, and the
corresponding trunk revision removed this file;
however, in r1542330 only the lines were removed

remove it now

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

commit | commitdiff | tree

Jeff Trawick [Fri, 22 Nov 2013 00:19:06 +0000 (00:19 +0000)]

merge r1544381 from trunk: no more fcgi_protocol.h

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

commit | commitdiff | tree

Eric Covener [Wed, 20 Nov 2013 19:11:06 +0000 (19:11 +0000)]

Merge r1543907 from trunk:

doc behavior change in r821333, CacheEnable foo / does not apply to forward
proxy.

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

commit | commitdiff | tree

Jim Jagielski [Tue, 19 Nov 2013 17:33:17 +0000 (17:33 +0000)]

And we are 2.4.8-dev

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

commit | commitdiff | tree

Jim Jagielski [Tue, 19 Nov 2013 17:31:34 +0000 (17:31 +0000)]

Get ready to tag 2.4.7

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

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