1
0
mirror of https://github.com/apache/httpd.git synced 2026-01-13 21:42:17 +03:00
Commit Graph

1756 Commits

Author SHA1 Message Date
Jeff Trawick
5497cdd2b2 fix typo in comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1374856 13f79535-47bb-0310-9956-ffa450edef68
2012-08-19 21:41:50 +00:00
Jeff Trawick
b6f86b92c2 The Pidfile directive and ap_log_pid()/ap_remove_pid()/ap_read_pid()
now respect DefaultRuntimeDir


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1369808 13f79535-47bb-0310-9956-ffa450edef68
2012-08-06 12:15:03 +00:00
Jeff Trawick
37d741a9ab core: Respect DefaultRuntimeDir/DEFAULT_REL_RUNTIMEDIR for the
scoreboard (ScoreBoardFile).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1369477 13f79535-47bb-0310-9956-ffa450edef68
2012-08-04 21:40:08 +00:00
Daniel Gruno
abafe1bd90 Typo fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1368396 13f79535-47bb-0310-9956-ffa450edef68
2012-08-02 09:17:34 +00:00
Daniel Gruno
63ebd9031a bad header info: ap_rflush does not return the number of bytes flushed, it returns 0 on success, -1 on error.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1368393 13f79535-47bb-0310-9956-ffa450edef68
2012-08-02 09:05:49 +00:00
Jeff Trawick
7479b23caa core: Add post_perdir_config hook.
Submitted by: Steinar Gunderson <sgunderson bigfoot.com>

trawick added/fixed include/ pieces


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1368121 13f79535-47bb-0310-9956-ffa450edef68
2012-08-01 16:54:00 +00:00
Daniel Gruno
8e0f68ea78 ap_str(case)cmp_match returns the opposite of what is advertized in the header.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1366319 13f79535-47bb-0310-9956-ffa450edef68
2012-07-27 09:57:09 +00:00
Joe Orton
6c41025260 Fix handling of ProxyBlock if a forward proxy is configured, and fix
mod_proxy_connect to avoid an inappropriate DNS lookup:

* modules/proxy/proxy_util.c (ap_proxy_checkproxyblock): Take hostname
  argument, make address argument optional.  Check names against
  hostname arg, omit if addr not given.
  (ap_proxy_determine_connection): Adjust for the above; pass hostname
  from URI not the next hop.

* modules/proxy/mod_proxy_ftp.c (proxy_ftp_handler): Adjust for
  ap_proxy_checkproxyblock change.

* modules/proxy/mod_proxy_connect.c (proxy_connect_handler): Adjust
  similarly, and avoid the DNS lookup on the request-URI hostname if a
  proxy is used.

* include/ap_mmn.h: Bump MMN.

PR: 43697


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1365001 13f79535-47bb-0310-9956-ffa450edef68
2012-07-24 12:17:00 +00:00
Jeff Trawick
58c1a25a96 mod_lbmethod_heartbeat, mod_heartmonitor: Respect DefaultRuntimeDir/
DEFAULT_REL_RUNTIMEDIR for the heartbeat storage file.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1364695 13f79535-47bb-0310-9956-ffa450edef68
2012-07-23 16:01:43 +00:00
Jeff Trawick
fb2066579f modernize some commentary on APEXIT_foo values
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1363186 13f79535-47bb-0310-9956-ffa450edef68
2012-07-19 00:09:27 +00:00
Jeff Trawick
952186c9f5 avoid decls for some Unix-specific functions on Win32 too
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1363035 13f79535-47bb-0310-9956-ffa450edef68
2012-07-18 18:28:04 +00:00
Rainer Jung
da40d757e7 Bump it up because of r1361784.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1362020 13f79535-47bb-0310-9956-ffa450edef68
2012-07-16 13:06:37 +00:00
Rainer Jung
b010e7ec9e Fix indentation.
No functional change.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1361791 13f79535-47bb-0310-9956-ffa450edef68
2012-07-15 20:29:56 +00:00
Rainer Jung
bfbbc819d5 Add missing HTTP status codes taken from
http://www.iana.org/assignments/http-status-codes/http-status-codes.xml 

The new codes are now known and some canned error
strings are provided. The web server does not yet actually
produce them in responses or reacts on getting them
from an origin server when acting as a proxy or gateway.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1361784 13f79535-47bb-0310-9956-ffa450edef68
2012-07-15 20:22:03 +00:00
Stefan Fritsch
0d77ab651b 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.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1359884 13f79535-47bb-0310-9956-ffa450edef68
2012-07-10 20:19:03 +00:00
Joe Orton
df256851fa * include/util_ldap.h: Treat LDAP_UNAVAILABLE as a transient error
with non-MS LDAP SDKs; seen with OpenLDAP against Novell eDirectory.

Submitted by: Filip Valder <filip.valder vsb.cz> (via RH bugzilla)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1348036 13f79535-47bb-0310-9956-ffa450edef68
2012-06-08 12:19:30 +00:00
Rich Bowen
7e7ed67d52 s/sinlge/single as per tid 53216. Via Christophe JAILLET
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1336891 13f79535-47bb-0310-9956-ffa450edef68
2012-05-10 21:13:53 +00:00
Stefan Fritsch
04906c79af Try to clarify what client_ip/client_addr means and point to useragent_ip
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1331115 13f79535-47bb-0310-9956-ffa450edef68
2012-04-26 21:51:09 +00:00
Stefan Fritsch
57a155737d fix some comments
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1328339 13f79535-47bb-0310-9956-ffa450edef68
2012-04-20 12:02:09 +00:00
Stefan Fritsch
c1600f6a02 For a local variable in a macro, use a name that is less likely to clash
with other variable names.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1327689 13f79535-47bb-0310-9956-ffa450edef68
2012-04-18 21:27:36 +00:00
Ruediger Pluem
e948002f96 * Add the forcerecovery balancer parameter that determines if recovery for
balancer workers without considering the retry value of workers is enforced.
  There might be cases where an already overloaded backend can get into deeper
  trouble if the recovery of all workers is enforced without considering the
  retry parameter of each worker


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1306409 13f79535-47bb-0310-9956-ffa450edef68
2012-03-28 15:22:40 +00:00
Ruediger Pluem
b794edf687 * Partly revert r1303435 and rename pconf back to in_pconf to avoid shadowing
the global variable with the same name and create a bogus assignment.

Pointed out by: Eric Covener


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1303827 13f79535-47bb-0310-9956-ffa450edef68
2012-03-22 15:15:26 +00:00
Guenter Knauf
2e728d6ee5 Revert r1294936 (Jeff's revert) and fix NetWare / Win32 build.
Added the missing AP_DECLARE* decorations for the function 
implementations and variables.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1303201 13f79535-47bb-0310-9956-ffa450edef68
2012-03-20 23:15:05 +00:00
Jeff Trawick
7f74a624c0 revert r1294936, which fixed MPM DSO load failures on AIX
it breaks the Netware build and was also missing the 
AP_DECLARE* decorations for the function implementations and
variables


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1301277 13f79535-47bb-0310-9956-ffa450edef68
2012-03-15 23:51:35 +00:00
Jim Jagielski
deab2b5786 Bump
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1298432 13f79535-47bb-0310-9956-ffa450edef68
2012-03-08 15:40:40 +00:00
Jim Jagielski
25c27c59dd Docs (and minor comment change) for DefaultRuntimeDir directive
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1297959 13f79535-47bb-0310-9956-ffa450edef68
2012-03-07 12:51:04 +00:00
Jim Jagielski
fc1b444d2e Fold on Jeff's DefaultRuntimeDir impl... docs on the way
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1297955 13f79535-47bb-0310-9956-ffa450edef68
2012-03-07 12:31:58 +00:00
Jeff Trawick
a1f372edf2 Fix MPM DSO load failure on AIX.
Without the proper AP_DECLARE*, these functions used by MPMs
were not exported from httpd on AIX, resulting in symbol
resolution errors.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1294936 13f79535-47bb-0310-9956-ffa450edef68
2012-02-29 01:52:17 +00:00
Stefan Fritsch
7a8f5c88aa Take care not to call ap_start_lingering_close from the listener thread,
because it may block when flushing data to the client.

From the listener thread, do a lingering close without flushing. This is
OK because we only do this if there has been an error during write
completion or if our send buffers are empty because we are in keep-alive.

PR: 52229


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1294356 13f79535-47bb-0310-9956-ffa450edef68
2012-02-27 22:04:54 +00:00
Stefan Fritsch
cba7493ed6 Fix another compiler warning
Submitted by: Daniel Shahaf <danielsh elego de>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1293535 13f79535-47bb-0310-9956-ffa450edef68
2012-02-25 05:30:43 +00:00
Stefan Fritsch
ea8cd427b2 Fix compiler warning
Submitted by: Daniel Shahaf <danielsh elego de>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1293534 13f79535-47bb-0310-9956-ffa450edef68
2012-02-25 05:28:11 +00:00
Stefan Fritsch
f36eefcf6f Fix MMN in comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1293427 13f79535-47bb-0310-9956-ffa450edef68
2012-02-24 21:27:37 +00:00
Stefan Fritsch
401b5be562 In maintainer mode, replace apr_palloc with a version that
initializes the allocated memory with non-zero values, except if
AP_DEBUG_NO_ALLOC_POISON is defined.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1293408 13f79535-47bb-0310-9956-ffa450edef68
2012-02-24 20:47:01 +00:00
Stefan Fritsch
cf345c4512 Add AP_HAVE_C99 to make correct check for C99 less onerous
Using __STDC_VERSION__ without checking if it is defined causes warnings
on C89.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1292043 13f79535-47bb-0310-9956-ffa450edef68
2012-02-21 21:36:37 +00:00
Rainer Jung
0415804814 BZ 52623: Fix building against PCRE 8.30.
PCRE dropped support for pcre_info() which is
deprecated since a long time. Use pcre_fullinfo()
instead, which exists since version 3.0 of PCRE.

Patch provided by Ruediger Pluem.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1243176 13f79535-47bb-0310-9956-ffa450edef68
2012-02-11 22:45:37 +00:00
Graham Leggett
9a0981b88d Fix spelling.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1242967 13f79535-47bb-0310-9956-ffa450edef68
2012-02-10 22:45:48 +00:00
Stefan Fritsch
1bbff8f19b Replace ap_create_core_ctx()/ap_core_ctx_get_bb() with a hook
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1240470 13f79535-47bb-0310-9956-ffa450edef68
2012-02-04 09:44:19 +00:00
Stefan Fritsch
d79b3c1513 Fix various filter functions to return apr_status_t instead of int
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1240315 13f79535-47bb-0310-9956-ffa450edef68
2012-02-03 19:48:01 +00:00
Rainer Jung
ab76ab0bb0 Forgot to bump MMN when advancing the
MODULE_MAGIC_COOKIE for trunk.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1239073 13f79535-47bb-0310-9956-ffa450edef68
2012-02-01 11:12:02 +00:00
Rainer Jung
d8e782ea5c I guess that makes sense.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1238528 13f79535-47bb-0310-9956-ffa450edef68
2012-01-31 13:51:03 +00:00
Rainer Jung
6f9bc21613 Update copyrights for externally visible and changed code
Forward port of r1234336 from 2.4.x.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1238399 13f79535-47bb-0310-9956-ffa450edef68
2012-01-31 11:38:22 +00:00
Stefan Fritsch
e499c6e683 Make the core input/output filter contexts private and provide accessor APIs
for mpm_winnt and mod_ftp.

This allows to add members to the context structs without breaking binary
compatibility.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1235019 13f79535-47bb-0310-9956-ffa450edef68
2012-01-23 21:58:42 +00:00
Joe Orton
65718cf0f5 SECURITY (CVE-2012-0031): Fix possible crash on shutdown if a child
changes the sb_type field in the scoreboard.  Since unprivileged
children should not be able to affect the parent in this way, this is
treated as a Low severity security issue.

Thanks to "halfdog" <me halfdog.net> for reporting this issue.

* include/scoreboard.h (global_score): Remove sb_type field.

* include/ap_mmn.h: Bump MMN for above.

* server/scoreboard.c (ap_cleanup_scoreboard, ap_create_scoreboard):
  Use a static global to store store the scoreboard type.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1230065 13f79535-47bb-0310-9956-ffa450edef68
2012-01-11 14:33:47 +00:00
Stefan Fritsch
3b2b67b26f Fix cut'n'paster error
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1229136 13f79535-47bb-0310-9956-ffa450edef68
2012-01-09 13:08:11 +00:00
Stefan Fritsch
75dad9d44f Rename ap_func_attr_* macros to AP_FN_ATTR_*
Add macro for attribute alloc_size on newer gcc's


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1229134 13f79535-47bb-0310-9956-ffa450edef68
2012-01-09 13:06:18 +00:00
Nick Kew
e0ddfe0fdf Core configuration: add AllowOverride option to treat syntax
errors in .htaccess as non-fatal.
PR 52439



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1229021 13f79535-47bb-0310-9956-ffa450edef68
2012-01-09 04:01:06 +00:00
William A. Rowe Jr
2aa21a62b1 Clean up size_t abuse, part 2. ap_malloc/calloc/realloc are explicitly
excluded from this cleanup as they must be signature identical to the
clib functions, and although the definition of size_t has been flakey,
the definition of those functions appears to be generally clean since
ANSI C.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1228323 13f79535-47bb-0310-9956-ffa450edef68
2012-01-06 18:15:08 +00:00
Stefan Fritsch
c77318c46e Avoid using C++ reserved word 'new' in arg name in header
Doc tweaks


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1226339 13f79535-47bb-0310-9956-ffa450edef68
2012-01-02 04:17:46 +00:00
Stefan Fritsch
caa0647d4d Add new ap_list_provider_groups() API for mod_info
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1225798 13f79535-47bb-0310-9956-ffa450edef68
2011-12-30 10:55:00 +00:00
Jim Jagielski
9675b7484f Allow for changing of string more easily...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1214296 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 15:29:19 +00:00