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

994 Commits

Author SHA1 Message Date
Ben Laurie
0db2718513 Add --enable-fips, FIPSify everything.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/fips-dev@190120 13f79535-47bb-0310-9956-ffa450edef68
2005-06-11 14:14:56 +00:00
Jeff Trawick
b5ed63df60 The new function ap_logs_child_init() is intended for use
only by the core server.  Require CORE_PRIVATE to obtain
the prototype.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@171093 13f79535-47bb-0310-9956-ffa450edef68
2005-05-20 10:50:17 +00:00
Jeff Trawick
7ae218a5bf Support the suppress-error-charset setting, as with Apache 1.3.x.
With Apache 1.3.x, it is a bit simpler as the request does
not go through ap_make_content_type().

Modules can set custom error responses but not be able to
set the charset, so they have to code the charset in the
html.  Thus, it is useful to preserve 1.3.x behavior exactly.

PR: 26467


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@170354 13f79535-47bb-0310-9956-ffa450edef68
2005-05-16 10:41:42 +00:00
Jeff Trawick
f78a4e4a89 Prevent hangs of child processes when writing to piped loggers at
the time of graceful restart. 

PR:          26467
Reviewed by: Joe Orton



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@170281 13f79535-47bb-0310-9956-ffa450edef68
2005-05-15 23:56:48 +00:00
Bradley Nicholes
1439ca9d5c Add the LDAPVerifyServerCert directive to util_ldap to force
verification of a server certificate when establishing an SSL connection
to the LDAP server


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@169705 13f79535-47bb-0310-9956-ffa450edef68
2005-05-11 22:34:18 +00:00
Paul Querna
da9a8de753 Add AP_INIT_TAKE_ARGV. There can be some inconsistent results because of the behavoir of ap_getword_conf. Do not rely upon any last argument that is "". If the argument is in the middle of the line, it should work correctly.
This is updated from the version sent to dev@httpd to fix the behavoir with 0 arguments.

* include/http_config.h: minor MMN bump for the new interface.
* modules/generators/mod_autoindex.c: Migrate IndexOptions to the new ARGV command type.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@168202 13f79535-47bb-0310-9956-ffa450edef68
2005-05-04 22:23:00 +00:00
Paul Querna
8f193f8538 The SPMT_OS2_MPM doesn't exist. The warning is also wrong, since both winnt and prefork MPMs call this function.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@168139 13f79535-47bb-0310-9956-ffa450edef68
2005-05-04 16:02:44 +00:00
Paul Querna
03c53e0a5b Add ap_vhost_iterate_given_conn() as I had previously mentioned on the mailing list.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@164538 13f79535-47bb-0310-9956-ffa450edef68
2005-04-25 05:23:18 +00:00
Paul Querna
af9ae7c2d7 Remove ap_method_list_do and ap_method_list_vdo as previously mentioned dev@httpd.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@164536 13f79535-47bb-0310-9956-ffa450edef68
2005-04-25 05:19:18 +00:00
Rich Bowen
6efa778213 As discussed on the list, change the default setting for
KeepAliveTimeout from 15 seconds to 5 seconds.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@161140 13f79535-47bb-0310-9956-ffa450edef68
2005-04-13 01:21:11 +00:00
Bradley Nicholes
38e8b5da89 Implement the exported function from mod_ldap(util_ldap) as optional functions so that we can eliminate the load ordering of mod_ldap and mod_authnz_ldap.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@159619 13f79535-47bb-0310-9956-ffa450edef68
2005-03-31 18:44:16 +00:00
Sander Striker
ac9a5e85ed And carry on with 2.1.5-dev.
* include/ap_release.h

  Bump AP_SERVER_PATCHLEVEL_NUMBER to 5.
  Set AP_SERVER_DEVBUILD_BOOLEAN.

* CHANGES

  Add a 2.1.5 section.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@157726 13f79535-47bb-0310-9956-ffa450edef68
2005-03-16 08:44:38 +00:00
Sander Striker
9c49c3b87b Prepare for 2.1.4 tag.
* include/ap_release.h

  Clear AP_SERVER_DEVBUILD_BOOLEAN.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@157725 13f79535-47bb-0310-9956-ffa450edef68
2005-03-16 08:43:38 +00:00
Justin Erenkrantz
a80f8410bd Add ReceiveBufferSize directive to control the TCP receive buffer.
Submitted by: Eric Covener <covener gmail.com>
Reviewed by:  Justin Erenkrantz (with minor formatting tweaks)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@157583 13f79535-47bb-0310-9956-ffa450edef68
2005-03-15 20:04:58 +00:00
Jeff Trawick
62de54117a really bump MMN
Submitted by: Sander Temme

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@156279 13f79535-47bb-0310-9956-ffa450edef68
2005-03-05 20:39:32 +00:00
Jeff Trawick
3e14f16867 worker MPM/mod_status: Support per-worker tracking of pid and
generation in the scoreboard so that mod_status can accurately
represent workers in processes which are gracefully terminating.

New child processes with worker MPM can take over slots of
individual threads within gracefully terminating processes.
Sometimes this is a problem (too many of these gracefully
terminating processes), so it is helpful to have mod_status
provide the information required to recognize these processes.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@156274 13f79535-47bb-0310-9956-ffa450edef68
2005-03-05 20:06:55 +00:00
Justin Erenkrantz
249b7dfcbb Onward ho to 2.1.4.
* CHANGES: Bump.
* include/ap_release.h: Bump.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@154973 13f79535-47bb-0310-9956-ffa450edef68
2005-02-23 06:29:31 +00:00
Justin Erenkrantz
5bc6a0a84f * include/ap_release.h: Time for 2.1.3.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@154971 13f79535-47bb-0310-9956-ffa450edef68
2005-02-23 06:27:41 +00:00
William A. Rowe Jr
fc979108b0 Fix some symbols which should -not- be exported, and decorate real_exit_code
with ap_ (this symbol must be exported.)  If the others were desired to be
  public, they should have been ap_xxx decorated.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@154216 13f79535-47bb-0310-9956-ffa450edef68
2005-02-18 00:00:37 +00:00
William A. Rowe Jr
e681eb22c8 Get httpd-2.1 building once again on win32.
NEVER NEVER screw around with redeclaring AP_ macros and constants.
  If the compiler won't pick them up, e.g., AP_DECLARE, ya've done 
  something wrong from the start.

  All httpd/ap headers depend on httpd.h - plain and simple, so this
  un-convolutes the unusual order here.

  STATIC has become PCRE_STATIC, along with some other odd definitions.
  The only remaining emit is that _pcre_free export is imported, which
  implies something is unusual with the declaration.  Still researching.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@154207 13f79535-47bb-0310-9956-ffa450edef68
2005-02-17 23:45:16 +00:00
Paul Querna
e2d4550b9d *) include/httpd.h: Add a brigade for temporary uses in the core input filter context.
*) server/core_filters.c: Do not use brigade_split, since it allocates a new brigade. Instead move buckets to our tmpbb, and reuse the tmpbb for every call.

PR: 33382


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@154200 13f79535-47bb-0310-9956-ffa450edef68
2005-02-17 22:53:07 +00:00
Joe Orton
1184182659 * include/httpd.h: Fix a comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@153408 13f79535-47bb-0310-9956-ffa450edef68
2005-02-11 15:03:12 +00:00
Joe Orton
27759dec9a * include/ap_regex.h: Include apr.h not stdlib.h; replace pointless
regoff_t typedef with int; s/size_t/apr_size_t/;.  Comment fixes.

* server/util_pcre.c: s/size_t/apr_size_t/.

* include/httpd.h: Include stdlib.h here instead since many other
files assume it was included by httpd.h at some point.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@153407 13f79535-47bb-0310-9956-ffa450edef68
2005-02-11 14:57:34 +00:00
Joe Orton
edb46b1de9 * include/util_ldap.h (util_ldap_state_t): Fix gcc format string
warnings: use a long for connectionTimeout since the code expects a
long.

* modules/ldap/util_ldap.c (compare_client_certs): Make static to fix
gcc missing-prototype warning.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@153390 13f79535-47bb-0310-9956-ffa450edef68
2005-02-11 12:22:16 +00:00
Joe Orton
a0570c8746 Move the POSIX reg* implementations into the ap_* namespace;
internalise the ap_reg*<->PCRE wrapper:

* configure.in: Add srclib/pcre to the include path.

* include/ap_regex.h: Renamed from include/pcreposix.h.  Prefix all
constants with AP_; prefix all functions and types with ap_.  Define
AP_DECLARE to nothing if necessary.  Remove regcomp error codes.

* include/httpd.h: Include ap_regex.h not pcreposix.h.
(ap_pregcomp, ap_regexec, ap_regfree): s/regex_t/ap_regex_t/.
(ap_regexec, ap_regerror): Prototypes moved to ap_regex.h.

* server/util.c (regex_cleanup, ap_pregcomp, ap_pregsub, ap_pregfree):
Adjust for ap_ prefixed types.  (ap_regexec, ap_regerror): Removed.

* server/Makefile.in: Build util_pcre.c.

* server/util_pcre.c: Copied from srclib/pcre/pcreposix.c; remove use
of PCRE-internals to do error mapping; rename types to add AP_/ap_
prefixes as above.  Use APR includes.  (ap_regerror): Use apr_snprintf.

* srclib/pcre/Makefile.in: Don't build pcreposix.c into libpcre.la.

* modules/*: Update to use new type and constant names.

PR: 27750 (part one)
Submitted by: Andres Salomon <dilinger voxel.net>, Joe Orton


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@153384 13f79535-47bb-0310-9956-ffa450edef68
2005-02-11 12:00:41 +00:00
Justin Erenkrantz
905cdf9f0b Update copyright year to 2005 and standardize on current copyright owner line.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@151408 13f79535-47bb-0310-9956-ffa450edef68
2005-02-04 20:28:49 +00:00
Jim Jagielski
9e6b472772 Keep track of time taken to process requests again.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@149550 13f79535-47bb-0310-9956-ffa450edef68
2005-02-02 19:32:18 +00:00
Joe Orton
2253f74e1e * include/ap_mmn.h: Fix typo.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@126611 13f79535-47bb-0310-9956-ffa450edef68
2005-01-27 14:33:06 +00:00
Bradley Nicholes
30eea48f9b Added a new LDAPConnectionTimeout directive to util_ldap so that the socket connection timeout value is configurable.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@126565 13f79535-47bb-0310-9956-ffa450edef68
2005-01-27 01:13:15 +00:00
Graham Leggett
c78537114e mod_ldap: Updated to use the new apr-util v1.1 apr_ldap_*_option()
API for the setting of server and client SSL certificates. Replaced
LDAPTrustedCA directive with LDAPTrustedGlobalCert and
LDAPTrustedClientCert directives to correctly support global certs
(CA certs / Netware client certs) and per connection client certs
as supported by Netware, OpenLDAP and Netscape/Mozilla.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@125645 13f79535-47bb-0310-9956-ffa450edef68
2005-01-19 19:52:08 +00:00
William A. Rowe Jr
8aea7cff22 Correct the order of includes to follow httpd conventions, and get
Win32 compiling again.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@124279 13f79535-47bb-0310-9956-ffa450edef68
2005-01-05 21:35:51 +00:00
William A. Rowe Jr
d962fcfc8b FINALLY Correct ap_http_method()! It is NOT a method, it's a SCHEME!
Bumped mmn, and ap module cookie, for this function rename.

  It's not a deprecation, as ap_http_method would be a lovely function
  name sometime in the future: to determine what the function name implies.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@123882 13f79535-47bb-0310-9956-ffa450edef68
2005-01-02 05:33:44 +00:00
Joe Orton
0ad30713dc * include/http_config.h: Add missing parameter name.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@111964 13f79535-47bb-0310-9956-ffa450edef68
2004-12-15 11:58:18 +00:00
Geoffrey Young
78c1d9dc3e undo changes made in 111386 due to veto
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@111432 13f79535-47bb-0310-9956-ffa450edef68
2004-12-09 21:09:26 +00:00
Geoffrey Young
fe1bfd7775 add response code 226 constant (HTTP_IM_USED) and status
line ("226 IM Used").  PR 31128.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@111386 13f79535-47bb-0310-9956-ffa450edef68
2004-12-09 14:16:16 +00:00
Justin Erenkrantz
c365121680 Onward ho to 2.1.3...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@111353 13f79535-47bb-0310-9956-ffa450edef68
2004-12-09 04:52:33 +00:00
Justin Erenkrantz
57a675b075 It's time for 2.1.2.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@111351 13f79535-47bb-0310-9956-ffa450edef68
2004-12-09 04:50:10 +00:00
Jeff Trawick
592750b026 worker MPM: Fix a problem which could cause httpd processes to
remain active after shutdown.

The problem occurred when a scoreboard entry currently
in use by an exiting child process was used for a new child
process.  At that point, the MPM forgot about the exiting
child process, so ap_reclaim_child_processes() wouldn't be
able to forceably terminate it.

(An exiting child process may *never* exit due to a stuck
or long-running request being handled on one of the threads.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@109510 13f79535-47bb-0310-9956-ffa450edef68
2004-12-02 17:39:22 +00:00
Joe Orton
a756d60d81 Fix gcc "no previous prototype" warnings after reorganisation:
* server/core_filters.c (ap_core_input_filter, ap_core_output_filter,
ap_net_time_filter): Renamed to add ap_ prefixes for global symbols.

* include/ap_listen.h: Don't export ap_listen_open at all, it's not
used outside server/listen.c any more.

* server/listen.c (open_listeners): Renamed from ap_listen_open.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@109498 13f79535-47bb-0310-9956-ffa450edef68
2004-12-02 13:28:04 +00:00
Justin Erenkrantz
9bc839ed59 Declare the ap_set_listen* functions with AP_DECLARE_NONSTD for Win32 support.
(I think this is what is needed for Win32, but I'm not quite sure.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106988 13f79535-47bb-0310-9956-ffa450edef68
2004-11-30 06:29:56 +00:00
William A. Rowe Jr
2ecaddd6a1 Revert my patch of this a.m. while I work out all the
potential forward declaration pitfalls.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106955 13f79535-47bb-0310-9956-ffa450edef68
2004-11-29 21:34:41 +00:00
William A. Rowe Jr
d6a9f1c620 Usage was inconsistent with the rest of ap_filter_t examples;
we always presume the typedef'fed flavor of such symbol names.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106932 13f79535-47bb-0310-9956-ffa450edef68
2004-11-29 17:41:49 +00:00
Justin Erenkrantz
503cf34e74 Properly export ap_listen_* functions.
* server/listen.c: Add AP_DECLARE as appropriate.
* include/ap_listen.h: Add AP_DECLARE as appropriate.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106843 13f79535-47bb-0310-9956-ffa450edef68
2004-11-28 19:37:41 +00:00
Brian Pane
c82b6595dc Moving pcreposix.h to include/ to replace the (now out of date) version there
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106755 13f79535-47bb-0310-9956-ffa450edef68
2004-11-27 20:21:20 +00:00
Brian Pane
c075aa2a96 Removing in order to "svn move" the new one from srclib/pcre to this location.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106754 13f79535-47bb-0310-9956-ffa450edef68
2004-11-27 20:19:44 +00:00
William A. Rowe Jr
b6bbf9791a Eliminate awk autogeneration of the ApacheMonitor's .rc resource
source file.

  By adding several macros to ap_release.h:

    - the stringize magic, in leiu of including a ton of cruft,
    - split subversion and "-dev" tokens (with a binary flag)
    - a _CSV token in the form of m,n,p (not a string)

  we are able to have use a static ApacheMonitor.rc file, which picks
  up all of the necessary values right from ap_release.h.

  If the group likes this approach, I will percolate it throughout
  the project, and we will lose the requirement of awk for everything
  -except- rewriting the installed httpd.conf script (developer builds
  always get an installed httpd.conf script - it's only 'fixed up' 
  with the correct @@ substitutions if they have awk.)

  This project was chosen because ApacheMonitor.rc already exists in svn.

  Comment please.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106313 13f79535-47bb-0310-9956-ffa450edef68
2004-11-23 16:57:18 +00:00
Paul Querna
34959f29db The Event MPM.
Designed to minimize Apache's KeepAlive overhead.

This MPM depends on the current APR-trunk for new features added to 
the apr_pollset interface. Currently the underlying operating
system must support KQueue or EPoll.

Status:
  Should work as a drop in replacement for all non-ssl servers.
  SSL Requests that use HTTP 1.1 Pipelining do not currently work.

Testing:
  I have tested it with Linux 2.6, FreeBSD 5.2.1, and OS X 10.3.
  
Originally based on the patch by Greg Ames.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105919 13f79535-47bb-0310-9956-ffa450edef68
2004-11-20 02:52:36 +00:00
Justin Erenkrantz
ce1e88c3f8 Onward to 2.1.2-dev.
* CHANGES: Bump...
* include/ap_release.h: to 2.1.2-dev.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105892 13f79535-47bb-0310-9956-ffa450edef68
2004-11-19 22:36:56 +00:00
Justin Erenkrantz
14fa8650b0 * include/ap_release.h: Bump to 2.1.1.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105890 13f79535-47bb-0310-9956-ffa450edef68
2004-11-19 22:34:45 +00:00
Joe Orton
c36ecfa64f Remove the .cvsignore files.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105796 13f79535-47bb-0310-9956-ffa450edef68
2004-11-19 09:07:29 +00:00