]>
granicus.if.org Git - apache/log
Jim Jagielski [Mon, 17 Dec 2012 11:49:56 +0000 (11:49 +0000)]
Merge r1406493, r1406495 from trunk:
Make <If> sections in virtual host context fill in cmd->path so that
other directive notice that they are in a config section.
This fixes LogLevel not working in <If> sections that are not in
Location/Directory/File sections.
Make ap_check_cmd_context() treat <If> sections like <File> sections.
This is necessary to properly disallow directives that don't work in
<If>.
A separate NOT_IN_IF flag may be nicer, but would create much more
hassle when being backported to 2.4.
Submitted by: sf
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1422877 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 17 Dec 2012 11:46:57 +0000 (11:46 +0000)]
Merge r1407248 from trunk:
*) mod_xml2enc: Fix problems with charset conversion altering the
Content-Length. [Micha Lenk <micha lenk info>]
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1422871 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 17 Dec 2012 11:45:35 +0000 (11:45 +0000)]
ipromote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1422868 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 17 Dec 2012 11:44:56 +0000 (11:44 +0000)]
ivote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1422865 13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Mon, 17 Dec 2012 11:44:02 +0000 (11:44 +0000)]
Removed my backport proposal in favour of Eric's and vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1422864 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Mon, 17 Dec 2012 11:40:05 +0000 (11:40 +0000)]
Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1422862 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 17 Dec 2012 11:35:26 +0000 (11:35 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1422858 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 17 Dec 2012 10:16:03 +0000 (10:16 +0000)]
Update the comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1422826 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 16 Dec 2012 23:15:48 +0000 (23:15 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1422711 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 16 Dec 2012 16:19:19 +0000 (16:19 +0000)]
Xforms.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1422615 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 16 Dec 2012 15:17:35 +0000 (15:17 +0000)]
Add a version compatibility section to the
expression parser docs page.
Partial backport of r1422594 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1422598 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 16 Dec 2012 15:02:34 +0000 (15:02 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1422590 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 16 Dec 2012 14:46:45 +0000 (14:46 +0000)]
ap_expr: Add req_novary function that allows HTTP header lookups
without adding the name to the Vary header.
Submitted by: sf
Backported by: rjung
Reviewed by: rjung, jailletc36, sf
Backport of r1403483 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1422586 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 16 Dec 2012 14:42:17 +0000 (14:42 +0000)]
Add a comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1422584 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 16 Dec 2012 14:21:21 +0000 (14:21 +0000)]
Fix typo in mmn comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1422583 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 16 Dec 2012 14:13:49 +0000 (14:13 +0000)]
mod_slotmem_*: Add in new fgrab() function which forces a grab and
slot allocation on a specified slot. Allow for clearing of inuse
array.
trunk patch: http://svn.apache.org/viewvc?view=revision&revision=
1386880
http://svn.apache.org/viewvc?view=revision&revision=
1387389
http://svn.apache.org/viewvc?view=revision&revision=
1388445
http://svn.apache.org/viewvc?view=revision&revision=
1394079
Submitted by: jim
Reviewed by: rjung, minfrin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1422580 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 16 Dec 2012 13:57:38 +0000 (13:57 +0000)]
mod_proxy_ftp: Fix segfaults on IPv4 requests to hosts with DNS AAAA records.
PR 40841.
trunk patch: http://svn.apache.org/viewvc?rev=
1404625 &view=rev
http://svn.apache.org/viewvc?rev=
1420223 &view=rev
2.4.x patch: http://people.apache.org/~jorton/proxyftpepsv-24.patch
Submitted by: jorton
Reviewed by: jim, minfrin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1422578 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 16 Dec 2012 13:16:42 +0000 (13:16 +0000)]
vote, promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1422574 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 16 Dec 2012 12:40:09 +0000 (12:40 +0000)]
Backported in r1422570.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1422571 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 16 Dec 2012 12:38:45 +0000 (12:38 +0000)]
mod_auth_form: Make sure that get_notes_auth() sets the user as does
get_form_auth() and get_session_auth(). Makes sure that REMOTE_USER
does not vanish during mod_include driven subrequests.
trunk patch: http://svn.apache.org/viewvc?rev=
1393152 &view=rev
Submitted by: minfrin
Reviewed by: minfrin, jim, gsmith
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1422570 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 16 Dec 2012 12:17:26 +0000 (12:17 +0000)]
Answer comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1422566 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 16 Dec 2012 11:33:23 +0000 (11:33 +0000)]
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1422533 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 16 Dec 2012 11:29:46 +0000 (11:29 +0000)]
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1422530 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 16 Dec 2012 10:33:10 +0000 (10:33 +0000)]
Vote + comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1422509 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Sun, 16 Dec 2012 08:59:54 +0000 (08:59 +0000)]
vote, promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1422489 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 15 Dec 2012 22:12:36 +0000 (22:12 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1422380 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 15 Dec 2012 22:09:42 +0000 (22:09 +0000)]
Merge r1422375 from https://svn.apache.org/repos/asf/httpd/httpd/trunk/:
PR54308: aliasmatch ^/foo matches requests for ////foo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1422376 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 15 Dec 2012 21:34:03 +0000 (21:34 +0000)]
not just leading slashes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1422363 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 15 Dec 2012 19:39:22 +0000 (19:39 +0000)]
r1422324 from trunk -- PR54307, Alias and leading slashes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1422325 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 15 Dec 2012 17:35:02 +0000 (17:35 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1422298 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 15 Dec 2012 14:32:14 +0000 (14:32 +0000)]
update proposal, comment on earlier proposal in same neighborhood.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1422254 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 15 Dec 2012 12:37:58 +0000 (12:37 +0000)]
propose backport const fixes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1422235 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 14 Dec 2012 19:56:50 +0000 (19:56 +0000)]
Add a few proposals.
No showstoppers for 2.4.4 but some of them
easy to vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1422061 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 14 Dec 2012 16:27:29 +0000 (16:27 +0000)]
ivote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1421967 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 14 Dec 2012 15:51:49 +0000 (15:51 +0000)]
Add changes entry for r1420827.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1421947 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 14 Dec 2012 15:20:20 +0000 (15:20 +0000)]
Vote, propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1421927 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 14 Dec 2012 14:49:29 +0000 (14:49 +0000)]
Xforms.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1421906 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 14 Dec 2012 14:28:14 +0000 (14:28 +0000)]
Trim compatibility info in docs.
Remove everything referring to pre 2.1
from 2.4 docs.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1421892 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 14 Dec 2012 12:51:31 +0000 (12:51 +0000)]
Put this on hold now...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1421830 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 14 Dec 2012 12:20:04 +0000 (12:20 +0000)]
Merge r1420975 from trunk:
Fix various clone/edit and search/replace errors
in MSVC project files
Submitted by: gsmith
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1421810 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 14 Dec 2012 10:34:02 +0000 (10:34 +0000)]
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1421787 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 13 Dec 2012 14:33:00 +0000 (14:33 +0000)]
icomment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1421311 13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Thu, 13 Dec 2012 13:54:03 +0000 (13:54 +0000)]
vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1421298 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 13 Dec 2012 13:44:24 +0000 (13:44 +0000)]
inherit inherit
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1421292 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Thu, 13 Dec 2012 11:04:17 +0000 (11:04 +0000)]
propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1421226 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 13 Dec 2012 10:05:24 +0000 (10:05 +0000)]
Fix typo.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1421185 13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Thu, 13 Dec 2012 10:04:51 +0000 (10:04 +0000)]
Added Windows CGI samples.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1421184 13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Thu, 13 Dec 2012 09:58:24 +0000 (09:58 +0000)]
Proposal.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1421179 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 12 Dec 2012 20:54:49 +0000 (20:54 +0000)]
Remove some obsolete comments about the "persist"
patch, add a few about "inherit".
Will likely vote tomorrow, but first need to test a bit.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1420966 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 12 Dec 2012 19:31:29 +0000 (19:31 +0000)]
htdbm:
- Add vxl to getopt
- Remove "-C" from usage for -x and -l
- Add space between -C and "cost"
- Usage reorder and sync with htpasswd
htpasswd:
- Usage reorder and sync with htdbm
Backport of r1420644 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1420925 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Wed, 12 Dec 2012 19:17:05 +0000 (19:17 +0000)]
vote and promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1420923 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 12 Dec 2012 16:52:34 +0000 (16:52 +0000)]
Merge r1405856 from trunk:
* fd is no member of disk_cache_object_t. Instead it is a member of
disk_cache_file_t. Close all fd's (fd, tempfd) for all cache elements
(hdrs, data, vary) if they are present.
Submitted by: rpluem
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1420827 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 12 Dec 2012 16:51:22 +0000 (16:51 +0000)]
ipromote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1420826 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 12 Dec 2012 16:50:52 +0000 (16:50 +0000)]
ivote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1420824 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 12 Dec 2012 16:48:29 +0000 (16:48 +0000)]
address more issues :)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1420822 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 12 Dec 2012 16:32:22 +0000 (16:32 +0000)]
Xforms.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1420812 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 12 Dec 2012 16:13:05 +0000 (16:13 +0000)]
Another comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1420805 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 12 Dec 2012 16:01:36 +0000 (16:01 +0000)]
Vote, comment.
Hope I'm not to dense.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1420795 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 12 Dec 2012 15:08:17 +0000 (15:08 +0000)]
Proposal.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1420737 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 12 Dec 2012 15:05:27 +0000 (15:05 +0000)]
Docs update concerning recent htpasswd and htdbm
additions.
Add some cross refernces between dbmmanage and htdbm.
Update man page for htdbm and htpasswd.
Add bcrypt info to misc/password_encryptions.
Backport of r1420686 from turnk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1420732 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 12 Dec 2012 15:04:03 +0000 (15:04 +0000)]
- Add missing documentation for ProxyHTMLMeta directive.
- Tidy up mod_proxy_html docs
PR 54269
- Fix validation error.
Backports of r1311468, r1420120 and r1420685 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1420728 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 12 Dec 2012 14:40:07 +0000 (14:40 +0000)]
update xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1420707 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 12 Dec 2012 14:19:54 +0000 (14:19 +0000)]
Merge r1407459, r1407460, r1419781, r1418524, r1401448, r1405407, r1405973, r1419726, r1418769, r1417197 from trunk:
remove warning:
mod_remoteip.c:404:38: warning: data argument not used by format string [-Wformat-extra-args]
It's a hack, but maintain the orig hack ;)
Remove warnings
mod_speling.c:400:41: warning: data argument not used by format string [-Wformat-extra-args]
r->uri, nuri, ref);
mod_speling.c:508:53: warning: data argument not used by format string [-Wformat-extra-args]
r->uri, candidates->nelts, ref);
Use 'apr_is_empty_table()' instead of testing against 'apr_table_elts(...)->nelts'
Use ap_rputs instead of ap_rvputs where applicable.
No need to apr_pstrdup things here, 'apr_socket_accept_filter' already makes it own copy.
Not compiled nor tested as on my system APR_HAS_SO_ACCEPTFILTER is set to 0.
revert r1401448 and add a comment on why there's a bewildering copy
of args passed to apr_socket_accept_filter()
cppCheck: kill two warnings about incorrect printf parameters.
'worker_thread_count' is unsigned
cppCheck: same expression on both side of '|'.
Fix it the same way other messages are managed in the function.
Fix a few 'too many arguments for format' warnings
cppCheck: kill a unread variable warning
Submitted by: jim, jailletc36, jailletc36, jailletc36, trawick, jailletc36, jailletc36, sf, jailletc36
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1420696 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 12 Dec 2012 14:18:32 +0000 (14:18 +0000)]
propose disk-cache fix for windows.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1420694 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 12 Dec 2012 14:15:05 +0000 (14:15 +0000)]
ipromote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1420689 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 12 Dec 2012 14:14:39 +0000 (14:14 +0000)]
ivote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1420687 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 12 Dec 2012 13:10:04 +0000 (13:10 +0000)]
these two SSL issues are stalled, IMO.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1420653 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 12 Dec 2012 13:07:57 +0000 (13:07 +0000)]
vote for cleanups backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1420652 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 12 Dec 2012 12:50:46 +0000 (12:50 +0000)]
backport vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1420646 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 11 Dec 2012 22:03:58 +0000 (22:03 +0000)]
Propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1420450 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 11 Dec 2012 16:47:06 +0000 (16:47 +0000)]
Note dependency
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1420274 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 11 Dec 2012 16:40:49 +0000 (16:40 +0000)]
Update
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1420269 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 11 Dec 2012 15:38:54 +0000 (15:38 +0000)]
Update mod_proxy_ftp EPSV handling patch per sf's comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1420229 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 11 Dec 2012 13:40:40 +0000 (13:40 +0000)]
Fix typo dbd -> dbm and add htdbm
to dbmmanage note.
Backport of r1420149 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1420151 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 11 Dec 2012 12:53:50 +0000 (12:53 +0000)]
Merge r1392345, r1392346 from trunk:
Bring XML output up to snuff for balancer-manager
and allow the xml param
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1420135 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 11 Dec 2012 12:50:48 +0000 (12:50 +0000)]
Address rjung's veto
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1420133 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 11 Dec 2012 11:32:30 +0000 (11:32 +0000)]
Fixed comment.
Submitted by: fuankg
Backported by: rjung
Reviewed by: fuankg,rjung (CTR docs/comment)
Backport of r1391771 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1420101 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 11 Dec 2012 10:37:25 +0000 (10:37 +0000)]
Start refactoring of htpasswd and htdbm
- Move many common code parts into separate source file. This adds some
of htpasswd's recent improvements to htdbm.
- Rework salt generation to use the full 48bit of entropy for MD5
Previously, it would only generate 2^32 different salts on a given
platform.
- Use apr_getopt().
Submitted by: sf
Backport of r1395253 from trunk.
Add passwd_common.c build support for Windows and Netware
Submitted by: sf
Backport of r1395254 from trunk.
Add support for bcrypt (requires apr-util 1.5 or higher).
PR: 49288
Submitted by: sf
Backport of r1395255 from trunk.
Optionally read passwords from stdin as more secure alternative to -b.
PR: 40243
Submitted by: Adomas Paltanavicius <adomas paltanavicius gmail com>, sf
Backport of r1395256 from trunk.
Submitted by: Adomas Paltanavicius <adomas paltanavicius gmail com>, sf
Removed __func__ usage which is c99.
Submitted by: sf
Backport of r1395792 from trunk.
All of the above backported by: sf
All of the above reviewed by: sf, gsmith, rjung
fix unresolved external symbol __imp__UuidCreate error
Submitted by: gsmith
Backported by: gsmith
Reviewed by: gsmith, rjung
Backport of r1419084 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1420084 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 11 Dec 2012 10:24:18 +0000 (10:24 +0000)]
mod_session_crypto: Protect ourselves against underlying libraries who
fail to load without providing an error message of their own.
Submitted by: minfrin
Backported by: minfrin
Reviewed by: minfrin, sf, rjung
Backport of r1418655 from turnk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1420072 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 11 Dec 2012 10:21:11 +0000 (10:21 +0000)]
mod_auth_form: Support the expr parser in the
AuthFormLoginRequiredLocation, AuthFormLoginSuccessLocation
and AuthFormLogoutLocation directives.
mod_auth_form: Make sure 500 Internal Server Error is
returned should an error occur while parsing an expression.
Submitted by: minfrin
Backported by: minfrin
Reviewed by: minfrin, sf, rjung
Backports of r1388648 and r1418721 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1420071 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 11 Dec 2012 10:10:27 +0000 (10:10 +0000)]
Change my vote after further thought.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1420064 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 11 Dec 2012 09:55:03 +0000 (09:55 +0000)]
Add support for TLS-SRP (Secure Remote Password key exchange
for TLS, RFC 5054).
Including some improvements as suggested by Kaspar
PR: 51075
Submitted by: Quinn Slack <sqs cs stanford edu>, Christophe Renou,
Peter Sylvester
Backported by: sf
Reviewed by: sf, minfrin, rjung
Backports of r1347980 and r1348653 form trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1420057 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 10 Dec 2012 11:23:51 +0000 (11:23 +0000)]
Comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1419346 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 10 Dec 2012 11:04:39 +0000 (11:04 +0000)]
Vote, comment, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1419340 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Mon, 10 Dec 2012 01:37:11 +0000 (01:37 +0000)]
vote with provision
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1419189 13f79535 -47bb-0310-9956-
ffa450edef68
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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