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

963 Commits

Author SHA1 Message Date
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
Bradley Nicholes
d2806c397b Add util_ldap_cache_getuserdn() prototype to the util_ldap.h header file
Submitted by:Jari Ahonen [jah progress.com]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105685 13f79535-47bb-0310-9956-ffa450edef68
2004-11-04 21:00:00 +00:00
Nick Kew
62f6d3d6bd Change FilterDeclare/FilterProvider semantics as discussed in
http://marc.theaimsgroup.com/?l=apache-httpd-dev&m=109899588616670&w=2


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105646 13f79535-47bb-0310-9956-ffa450edef68
2004-10-31 18:00:43 +00:00
Jeff Trawick
fa81c17b16 fix prototypes in documentation to match actual const-ness
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105631 13f79535-47bb-0310-9956-ffa450edef68
2004-10-30 11:46:06 +00:00
Jeff Trawick
81e4e36b0e add ap_log_cerror(); use it in a couple of places in core output filter
so that the client IP address is recorded in the log


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105625 13f79535-47bb-0310-9956-ffa450edef68
2004-10-29 14:45:24 +00:00
Nick Kew
a5278a9c0b Fixup broken handling of range header.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105613 13f79535-47bb-0310-9956-ffa450edef68
2004-10-28 13:21:08 +00:00
Nick Kew
ae6b8dcb99 Move ap_filter_provider_t back out of public API
(suggested by nd; makes sense to niq)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105603 13f79535-47bb-0310-9956-ffa450edef68
2004-10-27 09:20:33 +00:00
Roy T. Fielding
c76dd4ecef veto and revert win64 patch: 64bit changes must percolate from the
bottom (APR/system) up -- we can't give the client a 64bit API and
then cast it to 32bits internally without introducing security holes
on other platforms.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105572 13f79535-47bb-0310-9956-ffa450edef68
2004-10-23 22:39:53 +00:00
Allan K. Edwards
6c775f9a3c WIN64: API changes to clean up Windows 64bit compile warnings
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105545 13f79535-47bb-0310-9956-ffa450edef68
2004-10-22 15:22:05 +00:00
André Malo
a9a11aab67 allow <= and >= for filter dispatcher
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105507 13f79535-47bb-0310-9956-ffa450edef68
2004-10-17 18:31:44 +00:00
André Malo
551b03d1fb use more speaking names
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105501 13f79535-47bb-0310-9956-ffa450edef68
2004-10-17 15:44:21 +00:00
André Malo
c3e84f509a more style
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105500 13f79535-47bb-0310-9956-ffa450edef68
2004-10-17 15:18:56 +00:00
André Malo
59d38e22e1 save spaces! Soon in future we're going to run out of spaces!!!
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105499 13f79535-47bb-0310-9956-ffa450edef68
2004-10-17 14:25:04 +00:00
Erik Abele
438accf0f9 Minor comment fixes, no code changes:
- 'sub request' -> 'subrequest'
  - @retrn -> @return
  - ...

PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105408 13f79535-47bb-0310-9956-ffa450edef68
2004-10-11 19:27:29 +00:00
Nick Kew
72fb770d1a Merge mod_filter with util_filter structs; add API for protocol stuff.
Rename FilterDebug directive to FilterTrace.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105226 13f79535-47bb-0310-9956-ffa450edef68
2004-09-21 10:14:40 +00:00
Mladen Turk
a536cfe99b Worker shared data has to be visible across all child processes,
so remove creating that data on per-child basis.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105134 13f79535-47bb-0310-9956-ffa450edef68
2004-09-15 12:08:39 +00:00
Nick Kew
75fe3d7ce2 PR: 19688
Fix incorrect (and important) comments


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105089 13f79535-47bb-0310-9956-ffa450edef68
2004-09-12 15:50:43 +00:00
Stas Bekman
0226c056ec use more intuitive variable names
ap_sub_req_*_uri  to use new_uri
ap_sub_req_*_file to use new_file

PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104758 13f79535-47bb-0310-9956-ffa450edef68
2004-08-20 20:58:49 +00:00
Joe Orton
28a2fdc595 Implement -t -DDUMP_MODULES using generic test_config hook rather than
hooking into mod_so from main.c:

* include/http_config.h, server/config.c: Declare test_config hook.

* server/main.c: Drop hooks into mod_so; run test_config hooks.

* modules/mappers/mod_so.h: Drop ap_dump_loaded_modules optional
function.

* modules/mappers/mod_so.c (dump_loaded_modules): Renamed from
ap_dump_loaded_modules; only run if -DDUMP_MODULES is defined.
(register_hooks): Register test_config hook instead of optional
function.

Reviewed by: Justin Erenkrantz, Paul Querna


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104685 13f79535-47bb-0310-9956-ffa450edef68
2004-08-17 13:47:10 +00:00
Stas Bekman
d60aa10075 correct struct fields comments
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104633 13f79535-47bb-0310-9956-ffa450edef68
2004-08-12 05:22:59 +00:00
Graham Leggett
7262ac8dca Improve binary compatiblity. This fix was requested of me before it was committed, but it went in anyway - my bad :(
PR:
Obtained from:
Submitted by:	Mladen Turk <mturk@apache.org>
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104409 13f79535-47bb-0310-9956-ffa450edef68
2004-07-29 15:18:40 +00:00
Graham Leggett
e548632412 Add load balancer support to the scoreboard in preparation for
load balancing support in mod_proxy.
PR:
Obtained from:
Submitted by:	Mladen Turk <mturk@apache.org>
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104404 13f79535-47bb-0310-9956-ffa450edef68
2004-07-28 22:50:54 +00:00
Stas Bekman
2d217feaa4 fix the invalid return value entry for ap_meets_conditions
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104326 13f79535-47bb-0310-9956-ffa450edef68
2004-07-18 20:06:38 +00:00
William A. Rowe Jr
8bdbc199bc mod_so.h doesn't live here.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104294 13f79535-47bb-0310-9956-ffa450edef68
2004-07-15 00:25:41 +00:00
Paul Querna
9d66007aa2 Added 'AllowOverride Options=Indexes,MultiViews' to give an admin better
control over what options can be used in .htaccess files.

PR: 29310
Submitted by: Tom Alsberg <alsbergt-apache cs.huji.ac.il>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104283 13f79535-47bb-0310-9956-ffa450edef68
2004-07-14 06:36:42 +00:00
Paul Querna
4072b62bf8 Add DUMP_MODULES
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104213 13f79535-47bb-0310-9956-ffa450edef68
2004-07-10 03:38:02 +00:00
Bradley Nicholes
043a7ff9ed Replace the thread reader/writer lock that protects the shared memory cache to a global mutex so that the shared memory is protected across processes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104039 13f79535-47bb-0310-9956-ffa450edef68
2004-06-25 19:56:35 +00:00
Bradley Nicholes
9c0c56952d Enhance the util_ldap cache-info page to display the current contents of the search, compare and dn_compare caches
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103974 13f79535-47bb-0310-9956-ffa450edef68
2004-06-16 23:25:27 +00:00
André Malo
7accf16eed Nobody objected:
<IfModule> now takes the module identifier in addition to the
filename.

CAUTION: this commit breaks the build on netware. It still needs
to be adjusted. (but I don't have any netware knowledge...)
Also, developers need to re-run buildconf on unices.

PR: 29003
Submitted by: Edward Rudd <eddie omegaware.com>, Andr� Malo


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103849 13f79535-47bb-0310-9956-ffa450edef68
2004-06-04 22:40:47 +00:00
Graham Leggett
431e61008a Overhaul handling of LDAP error conditions, so that the util_ldap_*
functions leave the connections in a sane state after errors have
occurred.
PR: 27748, 17274, 17599, 18661, 21787, 24595, 24683, 27134, 27271
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103706 13f79535-47bb-0310-9956-ffa450edef68
2004-05-20 22:41:25 +00:00
André Malo
49f48fb4b4 changed the following APIs to return an error instead of hard exiting:
ap_add_module, ap_add_loaded_module, ap_setup_prelinked_modules,
and ap_process_resource_config


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103517 13f79535-47bb-0310-9956-ffa450edef68
2004-04-25 17:23:31 +00:00
André Malo
29e1f5d480 ap_add_named_module is not used and maintained anymore. Drop it.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103516 13f79535-47bb-0310-9956-ffa450edef68
2004-04-25 17:05:51 +00:00