1
0
mirror of https://github.com/apache/httpd.git synced 2026-01-26 19:01:35 +03:00
Commit Graph

263 Commits

Author SHA1 Message Date
William A. Rowe Jr
05fcc41a1f Update for latest structure changes for 2.0.21
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89644 13f79535-47bb-0310-9956-ffa450edef68
2001-07-20 20:00:50 +00:00
William A. Rowe Jr
9b3864b084 APR_FINFO_TYPE is all we really needed here.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89642 13f79535-47bb-0310-9956-ffa450edef68
2001-07-20 19:19:39 +00:00
William A. Rowe Jr
1adf783132 A pool is a REQUIRED ARGUMENT, never optional (NULL).
This is why Mladen observed that htpasswd was still broken.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89641 13f79535-47bb-0310-9956-ffa450edef68
2001-07-20 19:13:44 +00:00
David Reid
a4ca0ddd1b If we've spent the effort of getting some connections, when we die with an
error at least inform the user how many we completed before dying.
Tidy up some formatting...


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89639 13f79535-47bb-0310-9956-ffa450edef68
2001-07-20 09:51:43 +00:00
William A. Rowe Jr
6fd9442de5 A smart answer to users attempting the -s arg to ab.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89619 13f79535-47bb-0310-9956-ffa450edef68
2001-07-19 16:40:42 +00:00
Jeff Trawick
791dbc3a81 fix the type of parms to apr_send() and apr_recv()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89615 13f79535-47bb-0310-9956-ffa450edef68
2001-07-19 12:43:22 +00:00
William A. Rowe Jr
584c93dfb2 Truncate the working set in ab by introducing a connection pool.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89614 13f79535-47bb-0310-9956-ffa450edef68
2001-07-19 04:39:17 +00:00
William A. Rowe Jr
ef32166a5e Hmmm... editing with tabs != 8, eeuh. Just cleaning and fixing casts.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89596 13f79535-47bb-0310-9956-ffa450edef68
2001-07-18 18:08:57 +00:00
William A. Rowe Jr
1d8d61297f Fix some casting
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89595 13f79535-47bb-0310-9956-ffa450edef68
2001-07-18 17:56:14 +00:00
William A. Rowe Jr
b65ca11a4a Changes to back out inherit flag from apr_os_sock_make()
and apr_socket_create()


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89592 13f79535-47bb-0310-9956-ffa450edef68
2001-07-18 16:56:55 +00:00
Ryan Bloom
44715abbd2 Added an inherit flag to apr_socket_create and other socket creation
functions.  This allows APR programs to specify that a socket should
be passed to any child processes that are created.  The inherit flag
is only meaningful if programs use apr_process_create().  This
also adds a couple of macros that allow APR types to set and unset
the inherit flag.

This also fixes Apache to use the new API.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89557 13f79535-47bb-0310-9956-ffa450edef68
2001-07-16 16:11:05 +00:00
Ryan Bloom
8441f05fd9 Allow all parts of Apache 2.0 to build when --srcdir is used. This
required exposing a build directory and a source directory to all parts
of Apache's build system.  It also required a small hack in APR-util, if
we are using the bundled Expat, and we are using VPATH support, then we
have hard-coded the xml/expat location.  I couldn't figure out how to
allow the configure script to determine the correct location.  I added a
comment, but if somebody else figures it out, we should fix that at some
point.

PR:	7630


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89517 13f79535-47bb-0310-9956-ffa450edef68
2001-07-09 02:31:09 +00:00
William A. Rowe Jr
f6f3f613e3 Refresh .mak files for tagging 2.0.19
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89458 13f79535-47bb-0310-9956-ffa450edef68
2001-06-28 00:31:04 +00:00
Cliff Woolley
d3c97dfdac Fix spelling mistake.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89414 13f79535-47bb-0310-9956-ffa450edef68
2001-06-26 04:07:43 +00:00
Doug MacEachern
e63a05bbd1 apxs no longer generates ap_send_http_header() in the example handler
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89392 13f79535-47bb-0310-9956-ffa450edef68
2001-06-20 01:46:28 +00:00
Jeff Trawick
f5df386762 The patch fixes 2 things.
* apr_terminate now has the right declaration so it can be used
directly in atexit
* Win2K gets a divde by zero error when heartbeatres is zero (reproduce via
    support\Debug\ab.exe -k -c 6 -n 100 localhost/

Submitted by:   Ian Holsman <ianh@cnet.com>
Reviewed by:    Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89383 13f79535-47bb-0310-9956-ffa450edef68
2001-06-18 11:50:42 +00:00
Cliff Woolley
6f7f33a511 Silence gcc warning about rv being used when possibly uninitialized. That
can only happen if n<=1 (ie, a bad parameter value), so I figure APR_EINVAL
is the correct default value.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89333 13f79535-47bb-0310-9956-ffa450edef68
2001-06-11 14:46:30 +00:00
Bill Stoddard
9f0a1da97a Fix look in htdigest. Reimplemented getline to work properly with
APR. Shuld consider adding apr_file_getline() to APR.  Should also consider
changing apr_file_getc() to return characters rather than apr_status.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89331 13f79535-47bb-0310-9956-ffa450edef68
2001-06-10 21:01:57 +00:00
Victor J. Orlikowski
487c6a516f Greg was right, I was wrong.
We don;t need these here anymore, since the copy is done directly from the
server directory.
I need more sleep. :)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89308 13f79535-47bb-0310-9956-ffa450edef68
2001-06-08 15:02:25 +00:00
David Reid
50595e208b Small change to pass full paths instead of relatives.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89301 13f79535-47bb-0310-9956-ffa450edef68
2001-06-08 02:00:47 +00:00
Victor J. Orlikowski
4cbdb2eec0 Clean out httpd.exp when cleaning up.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89300 13f79535-47bb-0310-9956-ffa450edef68
2001-06-07 23:32:14 +00:00
Victor J. Orlikowski
2fdaf3c258 Ignore the now-irrelevant httpd.exp.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89299 13f79535-47bb-0310-9956-ffa450edef68
2001-06-07 23:29:54 +00:00
Victor J. Orlikowski
933765a7fa On the trail to getting make_export.awk pull in the right symbols.
Hence, we are tossing this old pain in the neck :)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89297 13f79535-47bb-0310-9956-ffa450edef68
2001-06-07 20:54:38 +00:00
Victor J. Orlikowski
d3feaed25f Generate httpd.exp on the fly.
This should allow DSOs to work on AIX, without the headache of maintaining
the httpd.exp file.
This is adapted from OS/2's generation of ApacheCoreOS2.def.
There exist a few bugs still:
    1) mod_dav and mod_proxy may not yet work, due to certain namespace issues.
    2) Some symbols may need to be added, a la core_header.def
Once these have been fixed, the old httpd.exp file will be deleted.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89288 13f79535-47bb-0310-9956-ffa450edef68
2001-06-07 10:03:29 +00:00
Ben Laurie
6148b98964 Utility to list available hooks.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89232 13f79535-47bb-0310-9956-ffa450edef68
2001-05-27 15:31:08 +00:00
Jeff Trawick
646c99e26c export apr_strtok() too
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89218 13f79535-47bb-0310-9956-ffa450edef68
2001-05-23 14:25:49 +00:00
Victor J. Orlikowski
9e8bb94e22 When AP_DEBUG is defined, these two need to be in here.
When it is not defined, this does not make a difference.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89206 13f79535-47bb-0310-9956-ffa450edef68
2001-05-22 22:20:38 +00:00
Victor J. Orlikowski
9be39a9bf5 Ooops. Leftovers.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89203 13f79535-47bb-0310-9956-ffa450edef68
2001-05-22 19:06:47 +00:00
Victor J. Orlikowski
19a91c1389 More exp file changes
Obtained from: Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89202 13f79535-47bb-0310-9956-ffa450edef68
2001-05-22 19:01:53 +00:00
Jeff Trawick
f9046d9b7b get rid of a warning for missing strXXX prototype. (I only saw this
on RH 7.1.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89188 13f79535-47bb-0310-9956-ffa450edef68
2001-05-21 19:17:20 +00:00
Jeff Trawick
e010d89683 Get httpd.exp with recent hook changes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89183 13f79535-47bb-0310-9956-ffa450edef68
2001-05-21 12:18:53 +00:00
William A. Rowe Jr
4e45cf5115 Return missing link flags to apxs.in
Submitted by:	Harrie Hazewinkel <harrie@covalent.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89159 13f79535-47bb-0310-9956-ffa450edef68
2001-05-18 19:34:48 +00:00
Roy T. Fielding
62367507a9 Change the make targets and rules to be consistent in all of the
Apache-owned source trees.  Sanity is a good thing.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89140 13f79535-47bb-0310-9956-ffa450edef68
2001-05-18 00:48:57 +00:00
Jeff Trawick
a269642940 apr_proc_probe_writable_fds is gone
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89132 13f79535-47bb-0310-9956-ffa450edef68
2001-05-17 10:41:56 +00:00
William A. Rowe Jr
84ea63d1f0 A bit more clarity, and that's it for now.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89111 13f79535-47bb-0310-9956-ffa450edef68
2001-05-14 04:31:56 +00:00
William A. Rowe Jr
f045d56d79 Clarify the wintty purpose and syntax.
Still some todos: an option to just abort user feedback and close the
  window instantly upon loosing the stdin pipe, allow the stdin pipe to
  be tee'ed on win32, and still add some graceful error handling for a
  real-world deployment.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89110 13f79535-47bb-0310-9956-ffa450edef68
2001-05-14 04:27:18 +00:00
William A. Rowe Jr
71aed5cfc7 Q. "Why can't I watch my server's activity?" A. You can.
This is a little tool I dreamed up while fighting a ton of battles on
  several fronts.  It demonstrates that reliable piped logs on win32 still
  need work, that we launch log processes far too many times, and generally
  gives admins more blinky lights on win32.  But it's too practial of an
  example to leave on my hard drive gathering dust.

  Note that the support/win32 will be used for really non-unix/non-portable
  applications.  Perhaps something similiar would be useful all the way
  around, and perhaps some of this code can get into the apr core.  But for
  this moment, it serves a purpose for beta development.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89109 13f79535-47bb-0310-9956-ffa450edef68
2001-05-14 04:09:08 +00:00
Ryan Bloom
51f146f7f4 Fix apachectl so that it uses the configure program name.
Submitted by:	Daniel Lopez <daniel@rawbyte.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89061 13f79535-47bb-0310-9956-ffa450edef68
2001-05-09 15:56:50 +00:00
Jeff Trawick
7f82cbee14 get the MPMs consistent w.r.t. visibility of ap_max_requests_per_child
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89051 13f79535-47bb-0310-9956-ffa450edef68
2001-05-07 18:41:57 +00:00
Jeff Trawick
1cd0a094f0 account for the recent apr_pool_*abort changes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88973 13f79535-47bb-0310-9956-ffa450edef68
2001-05-02 02:27:29 +00:00
Doug MacEachern
446ad419be backing out this part of the recent apxs change
otherwise `apxs -q INCLUDEDIR' is broken using the default layout
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88957 13f79535-47bb-0310-9956-ffa450edef68
2001-04-27 20:57:38 +00:00
Martin Kraemer
3aa010a8a0 Fix APXS: treat sbindir as expected, fix "link" command.
Submitted by:	GOMEZ Henri <hgomez@slib.fr>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88951 13f79535-47bb-0310-9956-ffa450edef68
2001-04-27 15:30:21 +00:00
Doug MacEachern
cd7883893c Add ap_set_int_slot() function
PR:
Obtained from:
Submitted by:	John K. Sterling <sterling@covalent.net>
Reviewed by:	dougm


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88902 13f79535-47bb-0310-9956-ffa450edef68
2001-04-20 16:43:39 +00:00
Jeff Trawick
4fbca8ef81 account for the change to apr_create_signal_thread
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88883 13f79535-47bb-0310-9956-ffa450edef68
2001-04-18 18:20:03 +00:00
Ryan Bloom
575247be29 Do not install the binaries from the support directory twice.
PR:	7490
Submitted by:	jun-ichiro hagino <itojun@iijlab.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88836 13f79535-47bb-0310-9956-ffa450edef68
2001-04-13 00:46:22 +00:00
Roy T. Fielding
6cbe701862 Make ab work again by changing its native types to apr types and formats.
Submitted by:	Justin Erenkrantz <jerenkrantz@ebuilt.com>
Reviewed by:	Roy Fielding


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88819 13f79535-47bb-0310-9956-ffa450edef68
2001-04-12 07:34:17 +00:00
Roy T. Fielding
efd42bd8a4 Make clean, distclean, and extraclean consistently according to the
Gnu makefile guidelines.

Submitted by: Justin Erenkrantz <jerenkrantz@ebuilt.com>
Reviewed by:  Roy Fielding


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88809 13f79535-47bb-0310-9956-ffa450edef68
2001-04-11 06:44:07 +00:00
William A. Rowe Jr
5383bde83c Time to refresh mak on Win32
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88728 13f79535-47bb-0310-9956-ffa450edef68
2001-04-05 09:21:46 +00:00
Victor J. Orlikowski
8735167a29 Module writers for 2.0 shouldn't still be relying on a no-op for
compatibilities' sake. Let's kill ap_util_uri_init, since it serves no
purpose now.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88716 13f79535-47bb-0310-9956-ffa450edef68
2001-04-04 07:15:35 +00:00
Jeff Trawick
e14a9d7ce4 Uhh, we really need the prototypes for standard string functions.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88691 13f79535-47bb-0310-9956-ffa450edef68
2001-04-03 16:49:25 +00:00