www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2026-10-23 22:49:01 +03:00
Code Activity
15,273 Commits 62 Branches 313 Tags
fips-dev
Commit Graph

2798 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
Ben Laurie
e0f5748acd First cut, working FIPS mode. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/fips-dev@189992 13f79535-47bb-0310-9956-ffa450edef68
 2005-06-10 17:25:17 +00:00
Paul Querna
b4369f78a1 * server/main.c: Remove the suck_in_apr_password_validate() hack. apr_password_validate is part of the public APR interface and this hack should not be needed on any platform. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@179879 13f79535-47bb-0310-9956-ffa450edef68
 2005-06-03 20:35:27 +00:00
Paul Querna
579610c0c5 - Fix style nits in the new hash config code. No Functional changes. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@179618 13f79535-47bb-0310-9956-ffa450edef68
 2005-06-02 17:52:26 +00:00
Paul Querna
d4dfb2fc44 - Fix graceful restarts with the new hashed configuration. The hash now allocates out of the pconf pool, instead of the process pool. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@179617 13f79535-47bb-0310-9956-ffa450edef68
 2005-06-02 17:49:46 +00:00
Paul Querna
e1955172ab * event.c: Create ptrans pool as a child of pconf, to fix APR pool 
lifetime checks in apr_tables.c.

Based on r170896 changes to the Worker MPM.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@179355 13f79535-47bb-0310-9956-ffa450edef68
 2005-06-01 05:00:29 +00:00
Jeff Trawick
002ca1448b downgrade the log level of a proc_mutex_unlock error message 
when it occurs during restart; it isn't at all uncommon then
when SysV semaphores are used for the accept mutex

same logic already in place for two other mutex calls


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@179317 13f79535-47bb-0310-9956-ffa450edef68
 2005-05-31 23:57:41 +00:00
Paul Querna
3a4de8d171 - Use a hash for the configuration command lookup implementation. Now modules can properly directives without dependence on the LoadModule order. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@178990 13f79535-47bb-0310-9956-ffa450edef68
 2005-05-29 21:39:39 +00:00
Paul Querna
f96c9bb293 - Put a prefix on this error message to have a chance of finding it in the source. Just stuffing the parser error buffer into the error log is not helpful if I didn't know where it came from. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@178818 13f79535-47bb-0310-9956-ffa450edef68
 2005-05-27 20:23:08 +00:00
Wilfredo Sanchez
a77ad010eb Commits 160348 and 160352 are obviated by commit 178340 in APR. httpd 
should have to deal with EAGAIN on a socket it doesn't know is
non-blocking.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@178341 13f79535-47bb-0310-9956-ffa450edef68
 2005-05-25 01:55:28 +00:00
Jeff Trawick
76c0a8bdd2 fix minor annoyance on z/OS: __FILE__ is set to 
"./foo.c" instead of simply "foo.c", so filter
out all but the basename before logging it with
debug messages


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@178299 13f79535-47bb-0310-9956-ffa450edef68
 2005-05-24 22:11:24 +00:00
Paul Querna
897691ca2d Fix trailing backslashes in configuration directives. 
PR: 34834
Submitted by: Timo Viipuri <viipuri dlc.fi>
Reviewed by: Paul Querna


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@178209 13f79535-47bb-0310-9956-ffa450edef68
 2005-05-24 17:25:41 +00:00
Sander Striker
9b1a855882 Submitted by: Rüdiger Pluem <r.pluem@t-online.de> 
* server/core.c

  (default_handler): Always give the filters a chance at processing
   the response.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@178018 13f79535-47bb-0310-9956-ffa450edef68
 2005-05-23 20:54:10 +00:00
Joe Orton
9d9b45ae5c * server/mpm/worker/worker.c (listener_thread): Create ptrans pool as 
a child of pconf, to fix APR pool lifetime checks in apr_tables.c.

Submitted by: Joe Schaefer


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@170896 13f79535-47bb-0310-9956-ffa450edef68
 2005-05-19 09:01:22 +00:00
Joe Orton
4741d91295 * server/log.c (piped_log_spawn): Don't leak an fd for each 
invocation.

Reviewed by: Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@170719 13f79535-47bb-0310-9956-ffa450edef68
 2005-05-18 08:03:37 +00:00
Joe Orton
5e080e68d7 * server/log.c (ap_open_piped_log): Remove errno handling. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@170537 13f79535-47bb-0310-9956-ffa450edef68
 2005-05-17 08:03:03 +00:00
Joe Orton
534ee6332c * server/log.c (piped_log_spawn): Return the APR error code, 
as expected by piped_log_maintenance (and fixing "Unknown
error" messages in error path there).
(ap_open_piped_log): Expect an APR error code.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@170441 13f79535-47bb-0310-9956-ffa450edef68
 2005-05-16 19:59:05 +00:00
Joe Orton
b90c24d243 * server/protocol.c (read_request_line): Revert addition of error 
message which triggers every time dummy_connection() is used to wake
up a child.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@170433 13f79535-47bb-0310-9956-ffa450edef68
 2005-05-16 19:36:04 +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
Greg Ames
e06eaebac5 missed a couple. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@168649 13f79535-47bb-0310-9956-ffa450edef68
 2005-05-06 20:37:05 +00:00
Paul Querna
3bce42b631 Remove this old email from the source tree. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@168496 13f79535-47bb-0310-9956-ffa450edef68
 2005-05-06 02:26:26 +00:00
Paul Querna
7b4e286119 * server/listen.c: Remove the unused port parameter from open_listeners, and update the comment to reflect reality. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@168411 13f79535-47bb-0310-9956-ffa450edef68
 2005-05-05 21:15:45 +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
Greg Ames
5ceb57af0d worker and event mpms: transient thread creation errors shouldn't take down 
the whole server.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@168182 13f79535-47bb-0310-9956-ffa450edef68
 2005-05-04 20:00:23 +00:00
Joe Orton
a494258e4b * server/config.c (process_resource_config_nofnmatch): Fail with 
useful error message if the config file can't be opened.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@167965 13f79535-47bb-0310-9956-ffa450edef68
 2005-05-03 19:41:02 +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
Jim Jagielski
9ba8a004c9 Ensure that we always return a FQDN... This is not guaranteed by either 
apr_sockaddr_info_get() or apr_getnameinfo(). Also note that under
OS X, apr_getnameinfo() always seems to fail (at least on my
machines) so if we don't specific ServerName at the global setting,
we get a warning.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@164092 13f79535-47bb-0310-9956-ffa450edef68
 2005-04-21 17:30:21 +00:00
Jim Jagielski
038b44739b APRized ap_get_local_host() 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@162066 13f79535-47bb-0310-9956-ffa450edef68
 2005-04-20 20:40:46 +00:00
Bradley Nicholes
6905d3d9d5 Allow httpd on NetWare to build using either the standard socket libraries or the Winsock libraries. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@161368 13f79535-47bb-0310-9956-ffa450edef68
 2005-04-14 23:42:21 +00:00
Paul Querna
8fa473da43 BRIGADE_NORMALIZE could produce invalid results with 0 length buckets. 
Submitted By: Rici Lake


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@161367 13f79535-47bb-0310-9956-ffa450edef68
 2005-04-14 23:42:11 +00:00
Joshua Slive
fa4e866600 Merged the simple-conf branch changes r159781:160695 into the trunk. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@160696 13f79535-47bb-0310-9956-ffa450edef68
 2005-04-09 16:59:15 +00:00
Greg Ames
6eabfd6c6a use a more general but slightly slower test for a body. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@160573 13f79535-47bb-0310-9956-ffa450edef68
 2005-04-08 18:07:33 +00:00
Wilfredo Sanchez
ba778d2478 Use APR_STATUS_IS_EAGAIN rather than comparing against APR_EAGAIN. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@160352 13f79535-47bb-0310-9956-ffa450edef68
 2005-04-07 00:40:27 +00:00
Wilfredo Sanchez
4d2733dd51 In emulate_sendfile(), handle APR_EAGAIN from apr_socket_send(). 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@160348 13f79535-47bb-0310-9956-ffa450edef68
 2005-04-07 00:22:29 +00:00
Greg Ames
20b9c89da5 the style police have been sleeping 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@160211 13f79535-47bb-0310-9956-ffa450edef68
 2005-04-05 19:45:32 +00:00
Bill Stoddard
7936e9161a Win32: Eliminate useless debug error message 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@160209 13f79535-47bb-0310-9956-ffa450edef68
 2005-04-05 19:01:09 +00:00
Rich Bowen
ee8e3cfdd9 "misspelled" has been "mis-spelled" for quite long enough. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@159808 13f79535-47bb-0310-9956-ffa450edef68
 2005-04-02 20:00:39 +00:00
Greg Ames
2b3ad91040 clone_headers_no_body: remove all entity headers in addition to the 
Transfer-Encoding header when creating a GET subrequest



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@159410 13f79535-47bb-0310-9956-ffa450edef68
 2005-03-29 18:24:46 +00:00
Greg Ames
235fd33d8f don't propagate input headers describing a body to a subrequest. this can cause a 
back end server to hang in a read for a body which no longer exists.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@158798 13f79535-47bb-0310-9956-ffa450edef68
 2005-03-23 16:36:45 +00:00
Allan K. Edwards
e807f6b3c3 Fix Windows CompContext buff size miscalculation 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@158685 13f79535-47bb-0310-9956-ffa450edef68
 2005-03-22 21:50:54 +00:00
Paul Querna
1fe9d2eba8 sync with mod_status hacks in the worker mpm. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@157810 13f79535-47bb-0310-9956-ffa450edef68
 2005-03-16 21:48:57 +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
Paul Querna
49ff90cbe3 Add ap_mpm_is_experimental and ap_mpm_is_threaded. Use these instead of checking for specific MPMs. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@156574 13f79535-47bb-0310-9956-ffa450edef68
 2005-03-08 22:40:33 +00:00
Bradley Nicholes
bb35e2f831 Make sure that the secure listen sockets that are created and injected into the ap_listeners lists by mod_nw_ssl are handled correctly so that they remain open and reused across restarts. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@156556 13f79535-47bb-0310-9956-ffa450edef68
 2005-03-08 18:09:43 +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
Bill Stoddard
8af9f738b1 Win32: Init the args to mpm_service_install(). Prevents nasty things like segfaults 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@155833 13f79535-47bb-0310-9956-ffa450edef68
 2005-03-01 22:38:04 +00:00
Bill Stoddard
14aff882b6 Win32: output some useful debug messages when installing the service 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@154322 13f79535-47bb-0310-9956-ffa450edef68
 2005-02-18 17:05:29 +00:00
Bill Stoddard
5590c522d6 Win32: Move call of mpm_service_install to rewrite_args hook but continue thru post_config to check httpd.conf 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@154319 13f79535-47bb-0310-9956-ffa450edef68
 2005-02-18 16:31:06 +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