1
0
mirror of https://github.com/apache/httpd.git synced 2026-01-06 09:01:14 +03:00
Commit Graph

25174 Commits

Author SHA1 Message Date
Jeff Trawick
06e4f5daaa add apreq and skiplist to libhttpd, support mod_apreq
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1520888 13f79535-47bb-0310-9956-ffa450edef68
2013-09-08 18:06:47 +00:00
Jeff Trawick
ff6ed254d2 fix odd bug that prevented the manual from being installed
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1520877 13f79535-47bb-0310-9956-ffa450edef68
2013-09-08 15:12:43 +00:00
Eric Covener
7df7f005c4 elaborate on fastcgistarer, which is a) not yet supported on windows and
b) only needed when the frameworker doesn't have something built-in.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1520875 13f79535-47bb-0310-9956-ffa450edef68
2013-09-08 15:02:18 +00:00
Guenter Knauf
ef7ab2d600 Added missing export for proxy module.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1520866 13f79535-47bb-0310-9956-ffa450edef68
2013-09-08 13:12:21 +00:00
Jeff Trawick
db5efab552 support mod_lua; add some tweaks/disclaimers to the README
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1520856 13f79535-47bb-0310-9956-ffa450edef68
2013-09-08 11:57:35 +00:00
Jeff Trawick
3ad8be382d handle mod_ldap/mod_authnz_ldap, along with tiny infrastructure
for modules whose main source doesn't match the module name
(i.e., util_ldap.c vs. mod_ldap)

please let mod_ldap be the only user of that support foreverandever


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1520819 13f79535-47bb-0310-9956-ffa450edef68
2013-09-07 22:28:23 +00:00
Jeff Trawick
5215408948 Add macro for checking apr/apu defines like APR_HAS_feature,
and for now use it to detect APR_HAS_XLATE and APU_HAVE_CRYPTO.

Add special logic for special APR_HAS_LDAP.

Display summary of feature detection.

mod_session_crypto can now build, so do so if the prereq is present.
(By default it won't be activated.)

Sketch in more support for Lua, mod_charset_lite, mod_ldap, and
mod_authnz_ldap, though  they should be expected to fail until
somebody actually tries it and fixes the problem.

The documented ab issue was my own problem with a mismatch between
my compiler and the OpenSSL compiler, resolved by building OpenSSL
myself like everybody else.

Document another of the possibly zillions of bugs/limitations.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1520783 13f79535-47bb-0310-9956-ffa450edef68
2013-09-07 16:28:35 +00:00
Lucien Gentis
a4d716b6a9 Update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1520780 13f79535-47bb-0310-9956-ffa450edef68
2013-09-07 15:06:45 +00:00
Eric Covener
5fb59d21c2 style consistency in winnt's worker_main
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1520760 13f79535-47bb-0310-9956-ffa450edef68
2013-09-07 12:44:09 +00:00
Christophe Jaillet
b663bd4a01 Add a warning if protocol given in SSLProtocol or SSLProxyProtocol will override other parameters given in the same directive.
This could be a missing + or - prefix.

PR 52820

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1520445 13f79535-47bb-0310-9956-ffa450edef68
2013-09-05 22:30:59 +00:00
Jeff Trawick
dedba685f4 Mistakenly try to use a line comment to the end of your Listen
directive on Windows => crash-o-matic

Or,

WinNT MPM: Don't crash during child process initialization if the
Listen protocol is unrecognized. 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1520368 13f79535-47bb-0310-9956-ffa450edef68
2013-09-05 16:33:11 +00:00
Daniel Gruno
478d3dc36e mod_lua: init cookie as NULL.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1520256 13f79535-47bb-0310-9956-ffa450edef68
2013-09-05 08:59:10 +00:00
Daniel Gruno
63c46e2f6b remove an unneeded variable I just added, oops.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1520250 13f79535-47bb-0310-9956-ffa450edef68
2013-09-05 08:24:29 +00:00
Daniel Gruno
a952d5663d mod_lua: Use ap_cookie_read for reading cookie values, since it's already there.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1520248 13f79535-47bb-0310-9956-ffa450edef68
2013-09-05 08:23:05 +00:00
Jeff Trawick
25780634bd Set LONG_NAME and BIN_NAME to something reasonable for httpd.rc,
which otherwise sets the properties to "LONG_NAME" and "BIN_NAME".


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1520153 13f79535-47bb-0310-9956-ffa450edef68
2013-09-04 22:15:24 +00:00
Daniel Gruno
38024c1665 Add r:setcookie(key, val, secure, expires) and r:getcookie(key) to the request_rec table.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1519977 13f79535-47bb-0310-9956-ffa450edef68
2013-09-04 10:47:46 +00:00
Christophe Jaillet
1b52eab8b8 Update related to r1519556
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1519587 13f79535-47bb-0310-9956-ffa450edef68
2013-09-03 07:26:34 +00:00
Christophe Jaillet
b8e0469f43 Add missing space
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1519579 13f79535-47bb-0310-9956-ffa450edef68
2013-09-03 06:27:48 +00:00
Christophe Jaillet
1ce3b9a4ef mod_status, mod_echo: Fix the display of client addresses. They were truncated to 31 characters which is not enough for IPv6 addresses.
PR 54848 [Bernhard Schmidt <berni birkenwald de>]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1519556 13f79535-47bb-0310-9956-ffa450edef68
2013-09-03 04:49:20 +00:00
Eric Covener
227ffd6486 mod_lua: If the first yield() of a LuaOutputFilter returns a string, it should
be prefixed to the response as documented.

Also, don't put empty heap buckets in the brigade if a yield() is called with 
no string.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1519492 13f79535-47bb-0310-9956-ffa450edef68
2013-09-02 18:38:07 +00:00
Eric Covener
918ccd0014 mention some trickyness with mod_lua + mod_filter.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1519488 13f79535-47bb-0310-9956-ffa450edef68
2013-09-02 18:08:25 +00:00
Eric Covener
31fa28d314 avoid non-continous ranges in EBCDIC in the scanner, important characters like '{' come
between alphas in IBM1047.

(If you're reading this because you're building 2.4-or-later on z/OS, you'll have to build a new flex
with the system flex and system bison. flex-2.5.35 worked.)



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1519485 13f79535-47bb-0310-9956-ffa450edef68
2013-09-02 17:55:28 +00:00
Eric Covener
6ed59c742d forgot my name
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1519484 13f79535-47bb-0310-9956-ffa450edef68
2013-09-02 17:46:06 +00:00
Eric Covener
8582560883 mod_lua: Remove ETAG, Content-Length, and Content-MD5 when a LuaOutputFilter
is configured without mod_filter. [Eric Covener]



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1519483 13f79535-47bb-0310-9956-ffa450edef68
2013-09-02 17:45:40 +00:00
Eric Covener
bc12f5ca71 register LuaOutputFilters with AP_FILTER_PROTO_CHANGE|AP_FILTER_PROTO_CHANGE_LENGTH
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1519476 13f79535-47bb-0310-9956-ffa450edef68
2013-09-02 17:06:16 +00:00
Eric Covener
e5e62d9e8b *) mod_filter: Add "change=no" as a proto-flag to FilterProtocol
to remove a providers initial flags set at registration time.
     [Eric Covener]



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1519475 13f79535-47bb-0310-9956-ffa450edef68
2013-09-02 17:03:47 +00:00
Eric Covener
d7aa057282 Return a 500 error instead of DECLINED when LuaHook* script does not
return a numeric value.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1519398 13f79535-47bb-0310-9956-ffa450edef68
2013-09-02 11:43:53 +00:00
Eric Covener
20996af3ee trace4 logging of return codes from LuaHook* functions.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1519329 13f79535-47bb-0310-9956-ffa450edef68
2013-09-02 01:21:39 +00:00
Guenter Knauf
d9ff913363 Removed comment which should never have been committed.
(thanks Eric!)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1519285 13f79535-47bb-0310-9956-ffa450edef68
2013-09-01 15:37:41 +00:00
Daniel Gruno
0c8d0ccee0 some xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1519279 13f79535-47bb-0310-9956-ffa450edef68
2013-09-01 15:12:48 +00:00
Daniel Gruno
1ad63fbb73 Adding a simple logging hook for mod_lua, which allows users to create their own logs or bypass the generic logging on a per-request basis.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1519277 13f79535-47bb-0310-9956-ffa450edef68
2013-09-01 15:10:32 +00:00
Jeff Trawick
659017cc53 Let the location of APR[-Util] and PCRE libs and
includes default to the same prefix where this package
is installed, generally eliminating four required settings
for users.

APR trunk vs. APR[-Util] 1.x is selected automatically,
as is PCRE debug vs. release.  (But if you have both
debug and release builds of PCRE you may not like the choice,
and will need to override.

Add a bunch of gory details about the build to the configuration
summary.

Document that static PCRE builds aren't yet supported (before
or after this commit).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1519270 13f79535-47bb-0310-9956-ffa450edef68
2013-09-01 13:49:55 +00:00
Stefan Fritsch
728ec107c2 add some log messages and AP_DEBUG_ASSERTs for functions that should never be
called


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1519264 13f79535-47bb-0310-9956-ffa450edef68
2013-09-01 12:26:25 +00:00
Lucien Gentis
1384d80768 Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1519189 13f79535-47bb-0310-9956-ffa450edef68
2013-08-31 16:36:38 +00:00
Eric Covener
0b20132add remove c++ comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1519188 13f79535-47bb-0310-9956-ffa450edef68
2013-08-31 16:02:15 +00:00
Jeff Trawick
1ca9848f2d Simplify -DENABLE_MOD_foo to -DENABLE_FOO
Improve display of module selections at end of configuration

Zap an unused variable


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1519179 13f79535-47bb-0310-9956-ffa450edef68
2013-08-31 13:19:16 +00:00
Jeff Trawick
f606e222f4 add option EXTRA_INCLUDE_DIRS for pointing to outside directories
for .h files (sometimes needed with statically linked, third-party
modules)

axe remnant of the old way of finding private APR .h files

install .h files that live outside of the top include directory


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1519175 13f79535-47bb-0310-9956-ffa450edef68
2013-08-31 12:37:31 +00:00
Jeff Trawick
949aa7b034 adjust default module enablement to kinda-sorta sync with
autoconf-based build (see commentary added as part of this
revision

sync-ing is limited by 

* not all modules with prereqs can be built yet
* no infrastructure yet to control related modules together (e.g.,
  enabling mod_proxy also enables a slew of others)



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1518859 13f79535-47bb-0310-9956-ffa450edef68
2013-08-29 23:56:11 +00:00
Jeff Trawick
3e38b0b632 mention the PATH issue
this will be resolved for most users by bundlers/distributors, but some hints
are appropriate


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1518801 13f79535-47bb-0310-9956-ffa450edef68
2013-08-29 20:18:02 +00:00
Jeff Trawick
c8364dfcb3 move cmake howto/buglist to a separate file, README.cmake
add license text to CMakeLists.txt


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1518736 13f79535-47bb-0310-9956-ffa450edef68
2013-08-29 17:59:11 +00:00
Jeff Trawick
bf23ece364 Only minor adjustments were required to support 2.4.x too, so
look at AP_SERVER_MINORVERSION_NUMBER and adjust the lists of 
available modules and libhttpd sources.

The build already worked with apr/aprutil 1.x, so adjust the
doc, defaults, and todo list.

The --with-module equivalent is already done, so zap the todo.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1518676 13f79535-47bb-0310-9956-ffa450edef68
2013-08-29 15:40:52 +00:00
Jeff Trawick
96f14dd9d6 Fix source path to error documents and icons.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1518668 13f79535-47bb-0310-9956-ffa450edef68
2013-08-29 15:02:25 +00:00
Jeff Trawick
75f281b22d Don't forget to disable an optional module if the prerequisite
wasn't found.

Tweak the doc a little.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1518660 13f79535-47bb-0310-9956-ffa450edef68
2013-08-29 14:24:50 +00:00
Jeff Trawick
4cd73aa770 Support new configuration feature
-DWITH_MODULES=d:/path/to/mod_foo.c,d:/path/to/mod_bar.c,

analogous to --with-module=modpath:/path/to/mod_foo.c,...
with the autoconf-based build.

This introduces a dependency on awk, but only for users that
use this feature.  Other users will get the canned 
os/win32/modules.c.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1518414 13f79535-47bb-0310-9956-ffa450edef68
2013-08-28 23:01:12 +00:00
Jeff Trawick
1830b6b669 Generate and install .conf files
(with heavy lifting from tdonovan!).

Install sample docroot (if the top directory doesn't exist).

Change installation of error and icons directories to match
Unix -- only if the top directory doesn't exist.

Provide a simple Perl script to help with non-standard copy
semantics used by the install.

THIS ADDS PERL AS A BUILD PREREQ.  (The VisualStudio-specific
Windows build system required it too.)



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1518376 13f79535-47bb-0310-9956-ffa450edef68
2013-08-28 20:38:14 +00:00
Eric Covener
397bdd8c43 Expires in a 304 is not a contradiction in terms of r1487118:
- Expires, Cache-Control, and/or Vary, if the field-value might
        differ from that sent in any previous response for the same
        variant




git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1518269 13f79535-47bb-0310-9956-ffa450edef68
2013-08-28 16:07:50 +00:00
Eric Covener
3c60771823 remove <var> from the literal parm options
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1518267 13f79535-47bb-0310-9956-ffa450edef68
2013-08-28 15:51:19 +00:00
Eric Covener
43c2d37105 add "default" option to LDAPReferrals, to allow "off" to really mean "off".
Need compatibility tag/note if backported.

Submitted By: Jan Kaluza & Eric Covener



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1518265 13f79535-47bb-0310-9956-ffa450edef68
2013-08-28 15:49:07 +00:00
Jeff Trawick
0dd42d241f Handle the libxml2 prereq of some modules, including its possible
dependency on iconv.  With that in place, build mod_proxy_html
and mod_xml2enc if libxml2 is found.

Don't reference zlib or OpenSSL-related variables set by the 
FindXXX macro unless they were actually found (avoids a cmake
warning).

Improve the readme.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1518185 13f79535-47bb-0310-9956-ffa450edef68
2013-08-28 12:48:39 +00:00
Jeff Trawick
fafc97c73c Follow up to r1518041: zlib is found, deflate build is working
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1518042 13f79535-47bb-0310-9956-ffa450edef68
2013-08-28 00:59:05 +00:00