]>
granicus.if.org Git - apache/log
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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