]>
granicus.if.org Git - apache/log
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Daniel Ruggeri [Tue, 19 Nov 2013 16:38:29 +0000 (16:38 +0000)]
update note in STATUS
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1543486 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Tue, 19 Nov 2013 16:37:25 +0000 (16:37 +0000)]
Maybe not so ready - more chatting/details on dev list
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1543482 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 19 Nov 2013 16:27:36 +0000 (16:27 +0000)]
Good idea from Jeff
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1543475 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 19 Nov 2013 01:11:10 +0000 (01:11 +0000)]
Merge r1543282 from trunk:
Stringify ICON_FILE, like other values passed in via -Dxx=yy
With an out of tree build like cmake, certain paths to the source tree and icon
file can foil parsing of this line by the resource compiler unless the path is
quoted.
Submitted by: Bert Huijben
Reviewed by: trawick
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1543283 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 18 Nov 2013 21:18:12 +0000 (21:18 +0000)]
Merge r1543147 and r1543149 from trunk:
fix versioninfo fields for abs.exe
Workaround issue with defining a preprocessor symbol to a string value
with embedded blanks.
The extra, escaped quoting in the original version is required for passing
the definition over the command-line, but it broke Visual Studio builds.
For now, avoid the extra quoting when generating for Visual Studio.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1543165 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Mon, 18 Nov 2013 19:14:41 +0000 (19:14 +0000)]
Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1543111 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 18 Nov 2013 18:03:51 +0000 (18:03 +0000)]
rebuild xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1543096 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sun, 17 Nov 2013 21:25:02 +0000 (21:25 +0000)]
missed in applied patch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1542827 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 17 Nov 2013 20:10:28 +0000 (20:10 +0000)]
slotmem_shm: Error detection
trunk patch: https://svn.apache.org/viewvc?view=revision&revision=
1540161
https://svn.apache.org/viewvc?view=revision&revision=
1540163
https://svn.apache.org/viewvc?view=revision&revision=
1540178
https://svn.apache.org/viewvc?view=revision&revision=
1540179
https://svn.apache.org/viewvc?view=revision&revision=
1540220
http://svn.apache.org/viewvc?view=revision&revision=r1542413
2.4.x patch: http://people.apache.org/~jim/patches/slotmem-error2.patch
Submitted by: jim
Reviewed by: jorton, minfrin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1542803 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 17 Nov 2013 20:07:11 +0000 (20:07 +0000)]
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1542802 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 17 Nov 2013 16:25:06 +0000 (16:25 +0000)]
Merge r1542752 from trunk:
reword windows binaries text so it's clear that you may or may not see
binaries for a given release. Remove a "HTTPd" term that looked funny.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1542756 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sun, 17 Nov 2013 16:14:26 +0000 (16:14 +0000)]
Backport proposal to fix canon inconsistency between http, ajp and fcgi
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1542754 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sun, 17 Nov 2013 15:30:24 +0000 (15:30 +0000)]
Note new patch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1542749 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 16 Nov 2013 20:08:39 +0000 (20:08 +0000)]
Comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1542561 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 16 Nov 2013 20:05:42 +0000 (20:05 +0000)]
event: Use skiplist and fold in performance tweeks from trunk
trunk patch: http://svn.apache.org/viewvc?view=revision&revision=
1451706
http://svn.apache.org/viewvc?view=revision&revision=
1517365
http://svn.apache.org/viewvc?view=revision&revision=
1529442
2.4.x patch: http://people.apache.org/~jim/patches/httpd-2.4-event-v3.patch
Submitted by: jim
Reviewed by: rjung, minfrin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1542560 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 16 Nov 2013 20:03:46 +0000 (20:03 +0000)]
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1542559 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 16 Nov 2013 19:24:53 +0000 (19:24 +0000)]
mpm_unix: Add ap_mpm_podx_* implementation to avoid code duplication
and align w/ trunk.
trunk patch: http://svn.apache.org/viewvc?view=revision&revision=
1409214
http://svn.apache.org/viewvc?view=revision&revision=
1410004
2.4.x patch: http://people.apache.org/~jim/patches/httpd-2.4-podx-v2.patch
Submitted by: jim
Reviewed by: rjung, minfrin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1542557 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 16 Nov 2013 19:20:15 +0000 (19:20 +0000)]
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1542555 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 16 Nov 2013 18:55:39 +0000 (18:55 +0000)]
Potential rejection of valid MaxMemFree and ThreadStackSize directives
trunk patch: https://svn.apache.org/r1542338
Submitted by: Mike Rumph <mike.rumph oracle.com>
Reviewed by: trawick, covener, sf
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1542549 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sat, 16 Nov 2013 17:38:11 +0000 (17:38 +0000)]
follow up to r1542328: ssl_engine_dh.c is gone
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1542539 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 16 Nov 2013 17:13:43 +0000 (17:13 +0000)]
comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1542534 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 16 Nov 2013 16:51:07 +0000 (16:51 +0000)]
vote+promote, comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1542532 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 16 Nov 2013 15:09:46 +0000 (15:09 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1542523 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 15 Nov 2013 18:05:14 +0000 (18:05 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1542354 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 15 Nov 2013 17:50:24 +0000 (17:50 +0000)]
errno = 0
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1542344 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 15 Nov 2013 17:11:13 +0000 (17:11 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1542332 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 15 Nov 2013 17:09:16 +0000 (17:09 +0000)]
Merge r1523281, r1524368, r1525276, r1525280, r1525281 from trunk:
Switch from private FastCGI protocol handling to util_fcgi API.
Use apr_socket_timeout_get instead of hard-coded 30 seconds timeout.
Bring some envvar flexibility from mod_authnz_fcgi to mod_proxy_fcgi:
mod_proxy_fcgi: Remove 64K limit on encoded length of all envvars.
An individual envvar with an encoded length of more than 16K will be
omitted.
Borrow a fix from mod_authnz_fcgi:
mod_proxy_fcgi: Handle reading protocol data that is split between
packets.
Use ap_log_rdata() to dump the FastCGI header, axing a bunch
of custom data dumping code.
Submitted by: trawick, jkaluza, trawick, trawick, trawick
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1542330 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 15 Nov 2013 17:07:52 +0000 (17:07 +0000)]
Merge r1533065, r1491724, r1425360, r1496194 from trunk:
Eclipse code analysis warning
Reduce stack usage by 3k
style fixes, add comment
no code change
attribute and error reason reversed
Submitted by: jim, jailletc36, sf, covener
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1542329 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 15 Nov 2013 17:06:32 +0000 (17:06 +0000)]
remove empty file
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1542328 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 15 Nov 2013 17:06:18 +0000 (17:06 +0000)]
Merge r1526168, r1527291, r1527294, r1527295, r1527926 from trunk:
Streamline ephemeral key handling:
- drop support for ephemeral RSA keys (only allowed/needed
for export ciphers)
- drop pTmpKeys from the per-process SSLModConfigRec, and remove
the temp key generation at startup (unnecessary for DHE/ECDHE)
- unconditionally disable null and export-grade ciphers by always
prepending "!aNULL:!eNULL:!EXP:" to any cipher suite string
- do not configure per-connection SSL_tmp_*_callbacks, as it is
sufficient to set them for the SSL_CTX
- set default curve for ECDHE at startup, obviating the need
for a per-handshake callback, for the time being (and also
configure SSL_OP_SINGLE_ECDH_USE, previously left out)
For additional background, see
https://mail-archives.apache.org/mod_mbox/httpd-dev/201309.mbox/%
3C52358ED1 .
2070704 @velox.ch%3E
Follow-up fixes for r1526168:
- drop SSL_TMP_KEY_* constants from ssl_private.h, too
- make sure we also disable aNULL, eNULL and EXP ciphers
for per-directory SSLCipherSuite directives
- apply the same treatment to SSLProxyCipherSuite
Increase minimum required OpenSSL version to 0.9.8a (in preparation
for the next mod_ssl commit, which will rely on the get_rfcX_prime_Y
functions added in that release):
- remove obsolete #defines / macros
- in ssl_private.h, regroup definitions based on whether
they depend on TLS extension support or not
- for ECC and SRP support, set HAVE_X and change the rather awkward
#ifndef OPENSSL_NO_X lines accordingly
For the discussion prior to taking this step, see
https://mail-archives.apache.org/mod_mbox/httpd-dev/201309.mbox/%
3C524275C7 .
9060408 %40velox.ch%3E
Improve ephemeral key handling (companion to r1526168):
- allow to configure custom DHE or ECDHE parameters via the
SSLCertificateFile directive, and adapt its documentation
accordingly (addresses PR 49559)
- add standardized DH parameters from RFCs 2409 and 3526,
use them based on the length of the certificate's RSA/DSA key,
and add a FAQ entry for clients which limit DH support
to 1024 bits (such as Java 7 and earlier)
- move ssl_dh_GetParamFromFile() from ssl_engine_dh.c to
ssl_util_ssl.c, and add ssl_ec_GetParamFromFile()
- drop ssl_engine_dh.c from mod_ssl
For the standardized DH parameters, OpenSSL version 0.9.8a
or later is required, which was therefore made a new minimum
requirement in r1527294.
PR 55616 (add missing APLOGNO), part 2
Submitted by: kbrand
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1542327 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 15 Nov 2013 15:45:21 +0000 (15:45 +0000)]
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1542297 13f79535 -47bb-0310-9956-
ffa450edef68