]>
granicus.if.org Git - apache/log
Eric Covener [Sat, 15 Dec 2012 12:34:56 +0000 (12:34 +0000)]
const fixes for mod_imagemap, fatal on old xlc due to returning apr_table_get result
from non const function.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1422234 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 14 Dec 2012 22:40:38 +0000 (22:40 +0000)]
httxt2dbm: Correct length computation for the 'value' stored in the DBM file PR 47650
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1422135 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Fri, 14 Dec 2012 20:44:41 +0000 (20:44 +0000)]
mod_lua: Fix Windows compatibility issues and remove an unused variable. Thanks, Gregg!
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1422072 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 14 Dec 2012 16:14:06 +0000 (16:14 +0000)]
Allow for searching w/i shm slots for a specific worker and balancer
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1421953 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 14 Dec 2012 15:53:16 +0000 (15:53 +0000)]
Backported in r1420827.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1421948 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 14 Dec 2012 15:02:30 +0000 (15:02 +0000)]
Use inherit_set to let the global server set
the default for all vhosts.
Otherwise inherit would need to be disabled
redundantly in each vhost.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1421912 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 14 Dec 2012 14:34:50 +0000 (14:34 +0000)]
xforms.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1421895 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 14 Dec 2012 14:20:26 +0000 (14:20 +0000)]
be consistent
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1421882 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 14 Dec 2012 13:30:45 +0000 (13:30 +0000)]
Anticipate ordering for 2.4 backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1421852 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 14 Dec 2012 13:29:31 +0000 (13:29 +0000)]
Fix use of trailing slashes in proxy
balancer and member URLs and add a little
explanation.
Current behavior AFAIK:
- Any path of a balancer URL inside <Proxy>
is ignored. So lets not use e.g.trailing slashes
there. The URL should for consistency always
look like balancer://mycluster.
- The general comment about trailing slashes on the
left and right of ProxyPass is also right for
balancer use.
- Trailing slahes in BalancerMember in most cases
lead to double slashes on the origin server.
So lets drop them there and instead get the
ProxyPass to the balancer right.
- Path components in member URLs are only
needed, if different path prefixes are needed
for members in the same balancer (unlikely
but possible). If all members work with the
same non-empty additional prefix, put it
into the ProxyPass at the end of the balancer
instead.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1421851 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 14 Dec 2012 12:42:16 +0000 (12:42 +0000)]
Archaelogy.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1421824 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 14 Dec 2012 12:35:47 +0000 (12:35 +0000)]
Drop pre-2.3 compatibility notes from trunk docs.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1421821 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Fri, 14 Dec 2012 10:25:31 +0000 (10:25 +0000)]
mod_lua: Oops, there was a stray 'int i' in the middle of lua_ap_regex.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1421784 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Fri, 14 Dec 2012 10:15:37 +0000 (10:15 +0000)]
mod_lua: Fix signedness/other small bugs as per cjaillet/fuankg's emails - thanks guys :)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1421780 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Thu, 13 Dec 2012 22:43:31 +0000 (22:43 +0000)]
Add note about _fixshebang target in comments
Remove _install dependency, is not needed and will
cause problems.
If the cgi-bin folder does not exist yet, do nothing.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1421591 13f79535 -47bb-0310-9956-
ffa450edef68
Stephen Henson [Thu, 13 Dec 2012 14:52:47 +0000 (14:52 +0000)]
Add support for OpenSSL configuration commands.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1421323 13f79535 -47bb-0310-9956-
ffa450edef68
Stephen Henson [Thu, 13 Dec 2012 14:12:45 +0000 (14:12 +0000)]
Avoid use of deprecated functions for OpenSSL version >= 1.0
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1421305 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 13 Dec 2012 13:36:08 +0000 (13:36 +0000)]
inherit inherit
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1421288 13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Thu, 13 Dec 2012 10:35:57 +0000 (10:35 +0000)]
Added copying of .swf CGI to Windows install target.
Moved fixing of shebang to separate target so that it is
no longer executed by default and CGIs remain inactive.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1421203 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Wed, 12 Dec 2012 21:14:57 +0000 (21:14 +0000)]
Fix various clone/edit and search/replace errors
in MSVC project files
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1420975 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 12 Dec 2012 14:15:38 +0000 (14:15 +0000)]
Docs xforms.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1420690 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 12 Dec 2012 14:13:44 +0000 (14:13 +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.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1420686 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 12 Dec 2012 14:12:00 +0000 (14:12 +0000)]
Fix validation error.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1420685 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 12 Dec 2012 12:34:55 +0000 (12:34 +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
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1420644 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Tue, 11 Dec 2012 20:08:24 +0000 (20:08 +0000)]
mod_lua: Add a lot of core httpd/apr functionality to mod_lua
(such as regex matching, expr evaluation, changing/fetching server configuration/info - see docs for a complete list).
This also includes a bunch of automatically scraped functions, which may or may not be super useful.
Comments appreciated as always, especially on the more hacky bits.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1420377 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Tue, 11 Dec 2012 17:09:40 +0000 (17:09 +0000)]
lua_request.c: Add support for parsing multipart form data via r:parsebody. This is a bit RFC-centric, suggestions are most welcome.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1420286 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 11 Dec 2012 15:28:05 +0000 (15:28 +0000)]
* modules/proxy/mod_proxy_ftp.c (proxy_ftp_handler): Simplify EPSV
address handling to avoid overhead of unnecessary
binary->text->binary conversion, and ensuring the socket family
really matches the address used.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1420223 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 11 Dec 2012 14:13:44 +0000 (14:13 +0000)]
* modules/aaa/mod_authz_owner.h: Add header file with optional hook
declaration for "authz_owner_get_file_group".
* modules/aaa/mod_authz_dbm.c, modules/aaa/mod_authz_groupfile.c: Use
the header to pick up the above declaration; retrieve the optional
function in a hook; use a static variable to store the function
pointer.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1420184 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Tue, 11 Dec 2012 14:11:41 +0000 (14:11 +0000)]
lua_vmprep.c: Additional check to see if the resource list was successfully created, so we don't end up trying to fetch a non-existent resource list when we use the 'server' option for the LuaScope directive.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1420181 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Tue, 11 Dec 2012 14:06:41 +0000 (14:06 +0000)]
mod_lua/lua_request.c: Make r:write return the return value of ap_rwrite, so mod_lua can check for success/failure in writing.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1420176 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 11 Dec 2012 13:37:23 +0000 (13:37 +0000)]
Fix typo dbd -> dbm and add htdbm
to dbmmanage note.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1420149 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 11 Dec 2012 12:35:50 +0000 (12:35 +0000)]
rjung's suggestions...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1420124 13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Tue, 11 Dec 2012 12:11:29 +0000 (12:11 +0000)]
PR 54269
Tidy up mod_proxy_html docs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1420120 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 11 Dec 2012 11:06:09 +0000 (11:06 +0000)]
- Remove backported items from CHANGES.
- Add eventopt to CHANGES
- Remove obsolete compatibility note form SRP docs
(has been backported).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1420094 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 10 Dec 2012 21:35:16 +0000 (21:35 +0000)]
mod_proxy_balancer: It's totally unclear what Drn, Dis, Ign, Stby means.
PR 52478
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1419796 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 10 Dec 2012 21:24:59 +0000 (21:24 +0000)]
Use 'apr_is_empty_table()' instead of testing against 'apr_table_elts(...)->nelts'
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1419781 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 10 Dec 2012 20:53:24 +0000 (20:53 +0000)]
Avoid unnecessary %s substitution
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1419755 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 10 Dec 2012 20:23:50 +0000 (20:23 +0000)]
cppCheck: same expression on both side of '|'.
Fix it the same way other messages are managed in the function.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1419726 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 10 Dec 2012 20:19:20 +0000 (20:19 +0000)]
No need to clear memory that is fully initialized just the line after.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1419719 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 9 Dec 2012 21:50:13 +0000 (21:50 +0000)]
remove two more items that have been backported to 2.4
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1419170 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 9 Dec 2012 20:52:04 +0000 (20:52 +0000)]
Remove some backported items
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1419157 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Sun, 9 Dec 2012 18:46:22 +0000 (18:46 +0000)]
mod_allowmethods is not required for Apache to run,
do not load it in default minimal config
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1419085 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Sun, 9 Dec 2012 18:42:50 +0000 (18:42 +0000)]
fix unresolved external symbol __imp__UuidCreate error
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1419084 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 9 Dec 2012 12:18:06 +0000 (12:18 +0000)]
remove items backported to 2.4.x
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1418908 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Sun, 9 Dec 2012 09:46:47 +0000 (09:46 +0000)]
Add mod_allowhandlers to Windows build
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1418867 13f79535 -47bb-0310-9956-
ffa450edef68
Fabien Coelho [Sun, 9 Dec 2012 06:32:23 +0000 (06:32 +0000)]
add missing space for paragraph alignment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1418824 13f79535 -47bb-0310-9956-
ffa450edef68
Fabien Coelho [Sun, 9 Dec 2012 06:31:11 +0000 (06:31 +0000)]
Tell CHANGES about added 'Warning' directive.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1418823 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 8 Dec 2012 22:26:12 +0000 (22:26 +0000)]
Fix a few 'too many arguments for format' warnings
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1418769 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 8 Dec 2012 22:18:17 +0000 (22:18 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1418768 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 8 Dec 2012 22:16:31 +0000 (22:16 +0000)]
Add LogLevelOverride directive that allows to override the loglevel for
clients from certain IPs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1418767 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 8 Dec 2012 22:06:49 +0000 (22:06 +0000)]
make ssl_io_data_dump respect per-conn loglevel
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1418765 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 8 Dec 2012 22:06:09 +0000 (22:06 +0000)]
rename variables: s should be the server_rec
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1418763 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 8 Dec 2012 21:47:27 +0000 (21:47 +0000)]
Don't claim "BIO dump follows" if it is not logged due to log level config.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1418761 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 8 Dec 2012 20:32:00 +0000 (20:32 +0000)]
CVE-2012-3499
add missing html escaping
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1418752 13f79535 -47bb-0310-9956-
ffa450edef68
Fabien Coelho [Sat, 8 Dec 2012 19:06:50 +0000 (19:06 +0000)]
remove C99 features from 'Warning' directive handling
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1418734 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 8 Dec 2012 18:00:29 +0000 (18:00 +0000)]
mod_auth_form: Make sure 500 Internal Server Error is returned should an error
occur while parsing an expression.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1418721 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 8 Dec 2012 17:27:21 +0000 (17:27 +0000)]
rpm: Add the mod_allowhandlers and mod_mpm_eventopt modules to the spec
file.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1418714 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 8 Dec 2012 16:41:23 +0000 (16:41 +0000)]
rpm: Remove stray references to the epoch variable.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1418703 13f79535 -47bb-0310-9956-
ffa450edef68
Fabien Coelho [Sat, 8 Dec 2012 14:49:09 +0000 (14:49 +0000)]
Add minor 'Warning' directive as defined in current mod_macro.
* server/core.c: add 'Warning' directive by extending the 'Error'
directive implementation. The 'Error' behavior is slightly changed
so as to use verbose ap_log_error instead of returning the message.
* docs/manual/mod/core.xml: add documentation for 'Warning'.
* server/config.c: add comment about syntax vs configuration errors.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1418677 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 8 Dec 2012 12:12:16 +0000 (12:12 +0000)]
mod_session_crypto: Protect ourselves against underlying libraries who
fail to load without providing an error message of their own.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1418655 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 8 Dec 2012 12:04:33 +0000 (12:04 +0000)]
mod_cache_socache: Don't clean up too soon. If we do, revalidated requests
lose their bodies.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1418648 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 7 Dec 2012 23:39:05 +0000 (23:39 +0000)]
Add some __attribute__ for automatic format checking.
Correct one catch in sed0.c.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1418556 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 7 Dec 2012 22:31:40 +0000 (22:31 +0000)]
Use ap_rputs instead of ap_rvputs where applicable.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1418524 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 6 Dec 2012 19:58:04 +0000 (19:58 +0000)]
API sync... not crucial for trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1418049 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Wed, 5 Dec 2012 18:46:35 +0000 (18:46 +0000)]
fixed types since MSVC doesnt have uint*_t.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1417585 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 5 Dec 2012 17:30:30 +0000 (17:30 +0000)]
Userland change
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1417546 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 5 Dec 2012 17:07:50 +0000 (17:07 +0000)]
Add useful mod_status info... try to determine last time
a specific vhost was accessed/used.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1417529 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 5 Dec 2012 14:25:50 +0000 (14:25 +0000)]
save a apr_time_now() call for every request.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1417440 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 4 Dec 2012 21:23:25 +0000 (21:23 +0000)]
cppCheck: kill a unread variable warning
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1417197 13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Tue, 4 Dec 2012 11:24:06 +0000 (11:24 +0000)]
Fixed type mismatch.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1416889 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 3 Dec 2012 16:58:21 +0000 (16:58 +0000)]
* modules/ssl/ssl_engine_io.c (ssl_io_filter_error): Use the correct
response status in the 502 error bucket; fortuitously this error
bucket is currently ignored so this bug was not user-visible.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1416589 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 2 Dec 2012 22:25:20 +0000 (22:25 +0000)]
Avoid processing some files twice if APR_INCLUDEDIR and
APU_INCLUDEDIR containin the same path but differing in
doubled slashes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1416278 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 2 Dec 2012 10:33:27 +0000 (10:33 +0000)]
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/trunk@
1416150 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 2 Dec 2012 07:19:22 +0000 (07:19 +0000)]
error[120] is already defined in this function. Just use it instead of shadowing.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1416121 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 1 Dec 2012 14:27:45 +0000 (14:27 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1416001 13f79535 -47bb-0310-9956-
ffa450edef68
Igor Galić [Sat, 1 Dec 2012 10:00:17 +0000 (10:00 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1415965 13f79535 -47bb-0310-9956-
ffa450edef68
Igor Galić [Sat, 1 Dec 2012 09:50:47 +0000 (09:50 +0000)]
axe warnings about MSIE 5 and other dead browsers
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1415960 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 30 Nov 2012 17:24:01 +0000 (17:24 +0000)]
Fix peek
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1415753 13f79535 -47bb-0310-9956-
ffa450edef68
Igor Galić [Fri, 30 Nov 2012 09:05:46 +0000 (09:05 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1415550 13f79535 -47bb-0310-9956-
ffa450edef68
Igor Galić [Fri, 30 Nov 2012 09:05:12 +0000 (09:05 +0000)]
analogous to r1415075
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1415549 13f79535 -47bb-0310-9956-
ffa450edef68
Igor Galić [Thu, 29 Nov 2012 08:17:17 +0000 (08:17 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1415077 13f79535 -47bb-0310-9956-
ffa450edef68
Igor Galić [Thu, 29 Nov 2012 08:16:43 +0000 (08:16 +0000)]
than -> then
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1415075 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 29 Nov 2012 01:36:06 +0000 (01:36 +0000)]
add PR's in for recent commits
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1415024 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 29 Nov 2012 01:34:19 +0000 (01:34 +0000)]
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/trunk@
1415023 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 29 Nov 2012 00:24:44 +0000 (00:24 +0000)]
PR54222: catch invalid ServerTokens args
Submitted by: Jackie Zhang <jackie.qq.zhang gmail.com>
Reviewed/modified by: covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1415008 13f79535 -47bb-0310-9956-
ffa450edef68
Vincent Deffontaines [Tue, 27 Nov 2012 21:49:12 +0000 (21:49 +0000)]
Zombie translations
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1414412 13f79535 -47bb-0310-9956-
ffa450edef68
Igor Galić [Tue, 27 Nov 2012 10:32:32 +0000 (10:32 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1414104 13f79535 -47bb-0310-9956-
ffa450edef68
Igor Galić [Tue, 27 Nov 2012 10:29:20 +0000 (10:29 +0000)]
as reported by comments
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1414094 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 26 Nov 2012 17:18:54 +0000 (17:18 +0000)]
CVE-2012-3499 and CVE-2012-4558
Be sure to escape potential troubled strings
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1413732 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Wed, 21 Nov 2012 20:40:01 +0000 (20:40 +0000)]
mod_dumpio: Correctly log large messages + style issues
PR 54179
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1412278 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 21 Nov 2012 13:21:01 +0000 (13:21 +0000)]
Sometimes we miss the last few items in the Q due
to time fuzzyness. Force the full Q by adding an extra
2sec fudge factor
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1412086 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 20 Nov 2012 21:03:52 +0000 (21:03 +0000)]
Use apr_is_empty_table() instead of getting a table and checking the value of the 'nelts' field.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1411862 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 20 Nov 2012 16:03:09 +0000 (16:03 +0000)]
Bug from not using pools by default :)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1411715 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 19 Nov 2012 21:24:04 +0000 (21:24 +0000)]
Force even malloc'ed mem to be 0ed. And pull out wasted cycles that
did the nulling.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1411424 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 19 Nov 2012 21:10:51 +0000 (21:10 +0000)]
Some formatting and a bugfix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1411415 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 19 Nov 2012 19:31:34 +0000 (19:31 +0000)]
The compiler *should* do this, but just in case
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1411361 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 19 Nov 2012 16:28:13 +0000 (16:28 +0000)]
skiplist_destroy() is new-ish
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1411279 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 19 Nov 2012 16:17:19 +0000 (16:17 +0000)]
Remove from API
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1411274 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 19 Nov 2012 14:11:38 +0000 (14:11 +0000)]
Merge branch 'skiplist'
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1411190 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 18 Nov 2012 19:57:08 +0000 (19:57 +0000)]
s/;;/;/
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1410971 13f79535 -47bb-0310-9956-
ffa450edef68