1
0
mirror of https://github.com/apache/httpd.git synced 2026-10-23 22:49:01 +03:00

47 Commits

Author SHA1 Message Date
Eric Covener
fe171ffdf8 Merge r1918795, r1918814 from trunk:
maintain trusted flag


* Always trust content types that we set literally

Submitted by: covener, rpluem
Reviewed by: covener, jorton, rpluem

Github: closes #459


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1918839 13f79535-47bb-0310-9956-ffa450edef68
2024-07-02 13:07:17 +00:00
Stefan Eissing
6a5d3e006b Merged /httpd/httpd/trunk:r1879074-1879080,1879094-1879095,1879110-1879112,1879114,1879116-1879117,1879137,1879144-1879145,1879147,1879149,1879235,1879360
back port the mapping=servlet proxy logic.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1892161 13f79535-47bb-0310-9956-ffa450edef68
2021-08-10 08:27:18 +00:00
Yann Ylavic
1147de3b27 Merge r1883730 from trunk:
mod_case_filter_in: fix memory leak.

Each ap_malloc()ed buffer should be free()d with its bucket.

Submitted by: ylavic
Reviewed by: ylavic, jorton, covener


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1885140 13f79535-47bb-0310-9956-ffa450edef68
2021-01-05 10:26:40 +00:00
Yann Ylavic
b2254f13ba Merge r1883709 from trunk:
mod_example_hooks: fix global "trace" string lifetime.

[Assuming experiment/CTR here, fixes an ASan crash prevent ci]
Reviewed/backported by: ylavic


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1884378 13f79535-47bb-0310-9956-ffa450edef68
2020-12-13 10:17:55 +00:00
Jim Jagielski
4199cb4047 Merge r1756038 from trunk:
Fix spelling in comments and text files.
No functional change.
PR 59990

Submitted by: rjung
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1757669 13f79535-47bb-0310-9956-ffa450edef68
2016-08-25 12:48:18 +00:00
William A. Rowe Jr
15d6b5842e Clean up embedded abspaths that came along with resource
compilation on win32 (haven't worked out the clean patch
to apr/build/fixwin32mak.pl for this, yet).

This caused no issues in the 2.4.20 package, and does not
block a release.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1738140 13f79535-47bb-0310-9956-ffa450edef68
2016-04-07 15:04:27 +00:00
William A. Rowe Jr
3bfd026116 Win32-specific build files.
Going forwards, keep win32 build in svn once a tree is stable.
Visual Studio 2010 users cannot convert our .dsp files, and
ddk toolchain users couldn't either.

Applies the same logic as r1100294 on the 2.2.x branch.

Until the cmake build schema is entirely mature, these files
are needed for command-line builds of the 2.4 tree, and are
expected to change very little until the EOL of 2.4 branch.

The .dsp source files are not directly usable for any shipping
version of MSVC/Visual Studio (post-Visual Studio 97 release),
while the .mak exports of these projects are usable on any flavor
of the MS nmake build environment.  The .dsp source files are
retained for those users wishing to import these projects into
the modern vcproj/sln file format.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1736270 13f79535-47bb-0310-9956-ffa450edef68
2016-03-23 03:53:49 +00:00
Jim Jagielski
2492be95e7 Merge r1725485 from trunk:
Added many log numbers to log statements that
had none.

Those were not detected by the coccinelle script.

Submitted by: rjung
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1731085 13f79535-47bb-0310-9956-ffa450edef68
2016-02-18 15:07:06 +00:00
Rainer Jung
aded325d60 Add APLOGNO, first chunk (those that were
detected by coccinelle).

There are some more but they are easier to
backport once these here are applied.

Backport of r1725392, r1725394, r1725395
and r1725468 from trunk.

Submitted by: rjung
Reviewed by: jim, ylavic


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1729495 13f79535-47bb-0310-9956-ffa450edef68
2016-02-09 23:09:24 +00:00
Jim Jagielski
a2649df81b Merge r1705983 from trunk:
Fix some style issues on files that can easily be synch'ed with 2.4.x
Submitted by: jailletc36
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1707037 13f79535-47bb-0310-9956-ffa450edef68
2015-10-06 12:36:36 +00:00
Jim Jagielski
ef4d14fc21 Merge r1681795, r1682988, r1682979, r1682819, r1682816 from trunk:
initialize args to not print garbage mem during a RewriteRule parse error



Initialize args to not print garbage mem during a RewriteCond parse error (same as r1681795 for RewriteRule)

Improve style in examples.

Improve error message (related to PR57311 diagnostic)

Concat string at compile time in order to save a few cycles.

Submitted by: covener, jailletc36, jailletc36, jailletc36, jailletc36
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1683113 13f79535-47bb-0310-9956-ffa450edef68
2015-06-02 13:40:41 +00:00
Rainer Jung
afa86e05e5 Backport of r1629235:
mod_example_hooks: Fix some comments and log messages: module was
renamed form mod_example to mod_example_hooks long ago.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1629259 13f79535-47bb-0310-9956-ffa450edef68
2014-10-03 16:58:50 +00:00
Jim Jagielski
679d2ece88 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
2012-12-03 16:33:42 +00:00
Stefan Fritsch
9dcd56857e Merge r1211680:
Various fixes for log message tags:

- Remove tags in ssl_log_ssl_error() and ssl_log_cert_error()
- Instead add tags to various ssl_log_xerror, ssl_log_cxerror
  calls (ssl_log_rxerror is unused).
- likewise for modssl_proxy_info_log()

- Fix spelling of APLOG_NOERRNO in coccinelle script
- add support for ssl_log_*error and ap_log_cserror

- add some more tags missing due to APLOG_NOERRNO spelling error

- Remove tags from example modules (we don't want people to blindly copy
  those)



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1211682 13f79535-47bb-0310-9956-ffa450edef68
2011-12-07 22:36:29 +00:00
Stefan Fritsch
4a3467e4c6 Merge r1211663:
Remove usage of APLOG_NOERRNO. It has been a no-op since at least 2.0.x


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1211669 13f79535-47bb-0310-9956-ffa450edef68
2011-12-07 22:06:41 +00:00
Stefan Fritsch
b6ae8ca44a Backport r1209766, r1210252, r1210284:
Add lots of unique tags to error log messages

ssl_util.c: Downgrade some dynamic locking messages from level DEBUG
to TRACE1-3


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1210287 13f79535-47bb-0310-9956-ffa450edef68
2011-12-05 00:08:01 +00:00
Rainer Jung
f2f5137339 Move the examples README from experimental to
examples. Correct some basic errors in the file.

No functional change.

Backport of r1201198 from trunk.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1201199 13f79535-47bb-0310-9956-ffa450edef68
2011-11-12 05:57:34 +00:00
Rainer Jung
34d420d584 No functional change:
Choose consistent comments and remove explicit
module names, because those references easily
get outdated.

Backport of r1201194 from trunk.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1201195 13f79535-47bb-0310-9956-ffa450edef68
2011-11-12 05:44:53 +00:00
Rainer Jung
3df8f27e8c Choose consistent comments and remove explicit
module names, because those references easily
get outdated.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1201163 13f79535-47bb-0310-9956-ffa450edef68
2011-11-12 02:08:53 +00:00
Jim Jagielski
427c85bd23 Cleanup effort in prep for GA push:
Trim trailing whitespace... no func change



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1174751 13f79535-47bb-0310-9956-ffa450edef68
2011-09-23 13:39:32 +00:00
Stefan Fritsch
01ed21af9d Add wrappers for malloc, calloc, realloc that check for out of memory
situations.  Use them in most places where malloc, and friends are used.
This results in clean error messages in an out of memory situation instead of
segfaulting or silently malfunctioning. In some places, it just allows to
remove some logging code.

PR 51568, PR 51569, PR 51571.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1172686 13f79535-47bb-0310-9956-ffa450edef68
2011-09-19 16:25:42 +00:00
Stefan Fritsch
51226bdcca Fix various "variable 'x' set but not used" warnings.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1125877 13f79535-47bb-0310-9956-ffa450edef68
2011-05-22 07:42:18 +00:00
Guenter Knauf
888ec80125 Use a var INSTALLBASE to simplify NetWare installation rules.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1082821 13f79535-47bb-0310-9956-ffa450edef68
2011-03-18 04:56:06 +00:00
Guenter Knauf
bab978c56e Use var for prelude so its possible to change it at one place.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1082811 13f79535-47bb-0310-9956-ffa450edef68
2011-03-18 03:09:27 +00:00
Guenter Knauf
e8a8becc0f NetWare build overhaul in order to compile on Linux.
Removed absolute paths to imp files.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1079487 13f79535-47bb-0310-9956-ffa450edef68
2011-03-08 18:59:02 +00:00
Guenter Knauf
46b7e1d210 NetWare build overhaul in order to compile on Linux.
Take 1.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1079407 13f79535-47bb-0310-9956-ffa450edef68
2011-03-08 16:04:40 +00:00
Jeff Trawick
d9aaafe0bd fix compile failure in r1070616
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1070632 13f79535-47bb-0310-9956-ffa450edef68
2011-02-14 20:01:52 +00:00
Jim Jagielski
9175224482 New hook: ap_run_pre_read_request()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1070616 13f79535-47bb-0310-9956-ffa450edef68
2011-02-14 19:21:37 +00:00
Stefan Fritsch
385da96d50 Use ap_state_query() to fix many modules that were not correctly initializing
if they were not active during server startup but got enabled later during a
graceful restart (in which case they need to do all work during a single
config run).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1070153 13f79535-47bb-0310-9956-ffa450edef68
2011-02-12 21:23:56 +00:00
Guenter Knauf
5e8988e256 Removed obsolete include paths from NetWare makefiles.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@966904 13f79535-47bb-0310-9956-ffa450edef68
2010-07-22 23:38:58 +00:00
Stefan Fritsch
ebb62867fb Use the new APLOG_USE_MODULE/AP_DECLARE_MODULE macros everywhere to take
advantage of per-module loglevels


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@951895 13f79535-47bb-0310-9956-ffa450edef68
2010-06-06 16:59:50 +00:00
Stefan Fritsch
9d791e0e60 Fix some modules to make them compile with per-module loglevels.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@951894 13f79535-47bb-0310-9956-ffa450edef68
2010-06-06 16:56:08 +00:00
William A. Rowe Jr
01d300298f Catch up with ap_[proc|global]_mutex_create api change
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@940981 13f79535-47bb-0310-9956-ffa450edef68
2010-05-04 17:40:43 +00:00
Jeff Trawick
5bb9129383 fix this warning:
mod_example_hooks.c: In function ‘trace_nocontext’:
mod_example_hooks.c:494: warning: format not a string literal and no format arguments


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@918654 13f79535-47bb-0310-9956-ffa450edef68
2010-03-03 19:29:34 +00:00
Jeff Trawick
2e9668a33d Replace AcceptMutex, LockFile, RewriteLock, SSLMutex, SSLStaplingMutex,
and WatchdogMutexPath with a single Mutex directive.  Add APIs to
simplify setup and user customization of APR proc and global mutexes.  
(See util_mutex.h.)  Build-time setting DEFAULT_LOCKFILE is no longer
respected; set DEFAULT_REL_RUNTIMEDIR instead.

Some existing modules, such as mod_ldap and mod_auth_digest gain 
configurability for their mutexes.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@883540 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 23:17:51 +00:00
Jim Jagielski
83532ab628 Enhance ap_hook_monitor to pass along a server_rec (in
general the ap_server_conf) and tuck away some storage
in there which may be useful as an opaque data pointer.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@818825 13f79535-47bb-0310-9956-ffa450edef68
2009-09-25 11:59:30 +00:00
Brian Havard
60fbe11de1 Bring back OS/2 support.
Reverses r758929 with a little bit of conflict resolution.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@807930 13f79535-47bb-0310-9956-ffa450edef68
2009-08-26 08:56:13 +00:00
Jeff Trawick
ee32468a33 remove OS/2 platform support
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758929 13f79535-47bb-0310-9956-ffa450edef68
2009-03-26 23:47:52 +00:00
Jeff Trawick
2f9b9fdd70 remove BeOS OS support
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758891 13f79535-47bb-0310-9956-ffa450edef68
2009-03-26 22:23:44 +00:00
Rainer Jung
b010b34b87 Fix format type warning in mod_example_ipc.c.
Use APR_INT64_T_FMT instead of %d.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@731032 13f79535-47bb-0310-9956-ffa450edef68
2009-01-03 17:27:56 +00:00
Rainer Jung
2f1fa7d914 unixd_set_global_mutex_perms() -> ap_unixd_set_global_mutex_perms()
in mod_example_ipc.
Addition to change in r722399.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@730703 13f79535-47bb-0310-9956-ffa450edef68
2009-01-02 11:48:52 +00:00
William A. Rowe Jr
1ed653d36a Catch up with a host of changes to the current module set
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@664240 13f79535-47bb-0310-9956-ffa450edef68
2008-06-07 02:10:32 +00:00
Chris Darroch
c8ba67fb83 Avoid calling access control hooks for internal requests with
configurations which match those of the initial request.  Revert to
the original behaviour (call access control hooks for internal requests
with URIs different from the initial request) if any access control hooks
or providers are not registered as permitting this optimization.
Introduce wrappers for access control hook and provider registration
which can accept additional mode and flag data.

The configuration walk optimizations were originally proposed a while
ago (see http://marc.info/?l=apache-httpd-dev&m=116536713506234&w=2);
they have been used since then in production systems and appear to be
stable and effective.  They permit certain combinations of modules
and clients to function efficiently, especially when a deeply recursive
series of internal requests, such as those generated by certain WebDAV
requests, are all subject to the identical authentication and authorization
directives.

The major change from the original proposal is a cleaner mechanism for
detecting modules which may expect the old behaviour.  This has been
tested successfully with Subversion's mod_authz_svn, which specifically
requires the old behaviour when performing path-based authorization based
against its own private access control configuration files.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@644525 13f79535-47bb-0310-9956-ffa450edef68
2008-04-03 21:51:07 +00:00
André Malo
467bfbb11f svn:eol-style = native
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@604499 13f79535-47bb-0310-9956-ffa450edef68
2007-12-15 20:13:42 +00:00
Bradley Nicholes
d041412170 Fix up the NetWare build due to the rearranging of the examples and experimental directories.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@597208 13f79535-47bb-0310-9956-ffa450edef68
2007-11-21 21:01:09 +00:00
William A. Rowe Jr
ac6ab5f301 s/mod_example/mod_example_hooks/
and move mod_example_hooks, mod_case_filter[_in] to modules/examples/


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@596395 13f79535-47bb-0310-9956-ffa450edef68
2007-11-19 18:47:23 +00:00
Sander Temme
df96b77cf2 * Move the Example modules to the newly created examples subdirectory
* Hopefully correctly fudge the NWGNU make files
* Add mod_example_ipc (without NWGNU stuff or dsp)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@596093 13f79535-47bb-0310-9956-ffa450edef68
2007-11-18 15:41:03 +00:00