Permalink
Browse files

This commit was manufactured by cvs2svn to create tag 'mpm-merge-1'.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/tags/mpm-merge-1@83579 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
1 parent 64f9d0b commit d105125a55782903af78f3ebda767e45ce26b6e3 No Author committed Aug 5, 1999
Showing with 0 additions and 28,002 deletions.
  1. BIN docs/docroot/apache_pb.gif
  2. +0 −135 docs/manual/bind.html.en
  3. +0 −93 docs/manual/cgi_path.html.en
  4. +0 −588 docs/manual/content-negotiation.html.en
  5. +0 −177 docs/manual/custom-error.html.en
  6. +0 −1,153 docs/manual/developer/API.html
  7. +0 −392 docs/manual/dso.html.en
  8. +0 −195 docs/manual/handler.html.en
  9. +0 −270 docs/manual/install.html.en
  10. +0 −220 docs/manual/invoking.html.en
  11. +0 −265 docs/manual/mod/directive-dict.html.en
  12. +0 −254 docs/manual/platform/perf-bsd44.html
  13. +0 −285 docs/manual/platform/perf-dec.html
  14. +0 −122 docs/manual/platform/perf-hp.html
  15. +0 −175 docs/manual/platform/perf.html
  16. +0 −205 docs/manual/platform/readme-tpf.html
  17. +0 −62 docs/manual/platform/unixware.html
  18. +0 −572 docs/manual/platform/windows.html
  19. +0 −170 docs/manual/sections.html.en
  20. +0 −183 docs/manual/stopping.html.en
  21. +0 −518 docs/manual/suexec.html.en
  22. +0 −59 docs/manual/vhosts/fd-limits.html.en
  23. +0 −65 docs/manual/vhosts/index.html.en
  24. +0 −164 docs/manual/vhosts/name-based.html.en
  25. +0 −9 emacs-style
  26. +0 −86 include/ap_listen.h
  27. +0 −164 include/ap_mpm.h
  28. +0 −82 include/http_connection.h
  29. +0 −1 modules/aaa/mod_access.exp
  30. +0 −1 modules/aaa/mod_auth.exp
  31. +0 −1 modules/aaa/mod_auth_anon.exp
  32. +0 −1 modules/aaa/mod_auth_dbm.exp
  33. +0 −76 modules/echo/mod_echo.c
  34. +0 −1 modules/filters/mod_include.exp
  35. +0 −1 modules/generators/mod_asis.exp
  36. +0 −1 modules/generators/mod_autoindex.exp
  37. +0 −1 modules/generators/mod_cgi.exp
  38. +0 −1 modules/generators/mod_info.exp
  39. +0 −1 modules/generators/mod_status.exp
  40. +0 −1 modules/http/mod_mime.exp
  41. +0 −1 modules/loggers/mod_log_config.exp
  42. +0 −1 modules/mappers/mod_actions.exp
  43. +0 −1 modules/mappers/mod_alias.exp
  44. +0 −1 modules/mappers/mod_dir.exp
  45. +0 −1 modules/mappers/mod_imap.exp
  46. +0 −1 modules/mappers/mod_negotiation.exp
  47. +0 −1 modules/mappers/mod_rewrite.exp
  48. +0 −1 modules/mappers/mod_speling.exp
  49. +0 −1 modules/mappers/mod_userdir.exp
  50. +0 −1 modules/metadata/mod_cern_meta.exp
  51. +0 −1 modules/metadata/mod_env.exp
  52. +0 −1 modules/metadata/mod_expires.exp
  53. +0 −1 modules/metadata/mod_headers.exp
  54. +0 −1 modules/metadata/mod_mime_magic.exp
  55. +0 −1 modules/metadata/mod_setenvif.exp
  56. +0 −1 modules/metadata/mod_unique_id.exp
  57. +0 −1 modules/metadata/mod_usertrack.exp
  58. +0 −1 modules/proxy/libproxy.exp
  59. +0 −219 os/beos/beosd.c
  60. +0 −82 os/beos/beosd.h
  61. +0 −75 os/beos/os.c
  62. +0 −100 os/beos/os.h
  63. +0 −265 os/unix/unixd.c
  64. +0 −82 os/unix/unixd.h
  65. +0 −285 server/connection.c
  66. +0 −310 server/listen.c
  67. +0 −22 server/mpm/MPM.NAMING
  68. +0 −1 server/mpm/dexter/.cvsignore
  69. +0 −4 server/mpm/dexter/Makefile.libdir
  70. +0 −1,714 server/mpm/dexter/dexter.c
  71. +0 −114 server/mpm/dexter/mpm_default.h
  72. +0 −45 server/mpm/dexter/scoreboard.c
  73. +0 −94 server/mpm/dexter/scoreboard.h
  74. +0 −1 server/mpm/mpmt_pthread/.cvsignore
  75. +0 −4 server/mpm/mpmt_pthread/Makefile.libdir
  76. +0 −121 server/mpm/mpmt_pthread/mpm_default.h
  77. +0 −1,786 server/mpm/mpmt_pthread/mpmt_pthread.c
  78. +0 −656 server/mpm/mpmt_pthread/scoreboard.c
  79. +0 −234 server/mpm/mpmt_pthread/scoreboard.h
  80. +0 −1 server/mpm/prefork/.cvsignore
  81. +0 −4 server/mpm/prefork/Makefile.libdir
  82. +0 −97 server/mpm/prefork/mpm_default.h
  83. +0 −3,097 server/mpm/prefork/prefork.c
  84. +0 −206 server/mpm/prefork/scoreboard.h
  85. +0 −1 server/mpm/spmt_os2/.cvsignore
  86. +0 −4 server/mpm/spmt_os2/Makefile.libdir
  87. +0 −97 server/mpm/spmt_os2/mpm_default.h
  88. +0 −200 server/mpm/spmt_os2/scoreboard.h
  89. +0 −1,806 server/mpm/spmt_os2/spmt_os2.c
  90. +0 −1 srclib/expat-lite/.cvsignore
  91. +0 −41 srclib/expat-lite/CHANGES
  92. +0 −62 srclib/expat-lite/asciitab.h
  93. +0 −73 srclib/expat-lite/expat.html
  94. +0 −151 srclib/expat-lite/hashtable.c
  95. +0 −69 srclib/expat-lite/hashtable.h
  96. +0 −63 srclib/expat-lite/iasciitab.h
  97. +0 −62 srclib/expat-lite/latin1tab.h
  98. +0 −150 srclib/expat-lite/nametab.h
  99. +0 −63 srclib/expat-lite/utf8tab.h
  100. +0 −63 srclib/expat-lite/xmldef.h
  101. +0 −3,256 srclib/expat-lite/xmlparse.c
  102. +0 −482 srclib/expat-lite/xmlparse.h
  103. +0 −1,113 srclib/expat-lite/xmlrole.c
  104. +0 −111 srclib/expat-lite/xmlrole.h
  105. +0 −1,527 srclib/expat-lite/xmltok.c
  106. +0 −307 srclib/expat-lite/xmltok.h
  107. +0 −1,746 srclib/expat-lite/xmltok_impl.c
  108. +0 −71 srclib/expat-lite/xmltok_impl.h
  109. +0 −96 srclib/expat-lite/xmltok_ns.c
View
Deleted file not rendered
View
@@ -1,135 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<HTML><HEAD>
-<TITLE>Setting which addresses and ports Apache uses</TITLE>
-</HEAD>
-
-<!-- Background white, links blue (unvisited), navy (visited), red (active) -->
-<BODY
- BGCOLOR="#FFFFFF"
- TEXT="#000000"
- LINK="#0000FF"
- VLINK="#000080"
- ALINK="#FF0000"
->
-<!--#include virtual="header.html" -->
-<H1 ALIGN="CENTER">Setting which addresses and ports Apache uses</H1>
-
-<HR>
-
-When Apache starts, it connects to some port and address on the
-local machine and waits for incoming requests. By default, it
-listens to all addresses on the machine, and to the port
-as specified by the <TT>Port</TT> directive in the server configuration.
-However, it can be told to listen to more the one port, or to listen
-to only selected addresses, or a combination. This is often combined
-with the Virtual Host feature which determines how Apache
-responds to different IP addresses, hostnames and ports.<P>
-
-There are two directives used to restrict or specify which addresses
-and ports Apache listens to.
-
-<UL>
-<LI><A HREF="#bindaddress">BindAddress</A> is used to restrict the server to
- listening to
- a single address, and can be used to permit multiple Apache servers
- on the same machine listening to different IP addresses.
-<LI><A HREF="#listen">Listen</A> can be used to make a single Apache server
- listen
- to more than one address and/or port.
-</UL>
-
-<H3><A NAME="bindaddress">BindAddress</A></H3>
-<A
- HREF="mod/directive-dict.html#Syntax"
- REL="Help"
-><STRONG>Syntax:</STRONG></A> BindAddress <EM>[ * | IP-address
- | hostname ]</EM><BR>
-<A
- HREF="mod/directive-dict.html#Default"
- REL="Help"
-><STRONG>Default:</STRONG></A> <CODE>BindAddress *</CODE><BR>
-<A
- HREF="mod/directive-dict.html#Context"
- REL="Help"
-><STRONG>Context:</STRONG></A> server config<BR>
-<A
- HREF="mod/directive-dict.html#Status"
- REL="Help"
-><STRONG>Status:</STRONG></A> Core<P>
-
-Makes the server listen to just the specified address. If the argument
-is *, the server listens to all addresses. The port listened to
-is set with the <TT>Port</TT> directive. Only one BindAddress
-should be used.
-
-<H3><A NAME="listen">Listen</A></H3>
-<A
- HREF="mod/directive-dict.html#Syntax"
- REL="Help"
-><STRONG>Syntax:</STRONG></A> Listen <EM>[ port | IP-address:port ]</EM><BR>
-<A
- HREF="mod/directive-dict.html#Default"
- REL="Help"
-><STRONG>Default:</STRONG></A> <CODE>none</CODE><BR>
-<A
- HREF="mod/directive-dict.html#Context"
- REL="Help"
-><STRONG>Context:</STRONG></A> server config<BR>
-<A
- HREF="mod/directive-dict.html#Status"
- REL="Help"
-><STRONG>Status:</STRONG></A> Core<P>
-
-<TT>Listen</TT> can be used instead of <TT>BindAddress</TT> and
-<TT>Port</TT>. It tells the server to accept incoming requests on the
-specified port or address-and-port combination. If the first format is
-used, with a port number only, the server listens to the given port on
-all interfaces, instead of the port given by the <TT>Port</TT>
-directive. If an IP address is given as well as a port, the server
-will listen on the given port and interface. <P> Multiple Listen
-directives may be used to specify a number of addresses and ports to
-listen to. The server will respond to requests from any of the listed
-addresses and ports.<P>
-
-For example, to make the server accept connections on both port
-80 and port 8000, use:
-<PRE>
- Listen 80
- Listen 8000
-</PRE>
-
-To make the server accept connections on two specified
-interfaces and port numbers, use
-<PRE>
- Listen 192.170.2.1:80
- Listen 192.170.2.5:8000
-</PRE>
-
-<H2>How this works with Virtual Hosts</H2>
-
-BindAddress and Listen do not implement Virtual Hosts. They tell the
-main server what addresses and ports to listen to. If no
-&lt;VirtualHost&gt; directives are used, the server will behave the
-same for all accepted requests. However, &lt;VirtualHost&gt; can be
-used to specify a different behavior for one or more of the addresses
-and ports. To implement a VirtualHost, the server must first be told
-to listen to the address and port to be used. Then a
-&lt;VirtualHost&gt; section should be created for a specified address
-and port to set the behavior of this virtual host. Note that if the
-&lt;VirtualHost&gt; is set for an address and port that the server is
-not listening to, it cannot be accessed.
-
-<H2>See also</H2>
-
-See also the documentation on
-<A HREF="vhosts/index.html">Virtual Hosts</A>,
-<A HREF="mod/core.html#bindaddress">BindAddress directive</A>,
-<A HREF="mod/core.html#port">Port directive</A>,
-<A HREF="dns-caveats.html">DNS Issues</A>
-and
-<A HREF="mod/core.html#virtualhost">&lt;VirtualHost&gt; section</A>.
-
-<!--#include virtual="footer.html" -->
-</BODY>
-</HTML>
-
@@ -1,93 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<HTML><HEAD>
-<TITLE>PATH_INFO Changes in the CGI Environment</TITLE>
-</HEAD>
-
-<!-- Background white, links blue (unvisited), navy (visited), red (active) -->
-<BODY
- BGCOLOR="#FFFFFF"
- TEXT="#000000"
- LINK="#0000FF"
- VLINK="#000080"
- ALINK="#FF0000"
->
-<!--#include virtual="header.html" -->
-<H1 ALIGN="CENTER">PATH_INFO Changes in the CGI Environment</H1>
-
-<HR>
-
-<H2><A NAME="over">Overview</A></H2>
-
-<P>As implemented in Apache 1.1.1 and earlier versions, the method
-Apache used to create PATH_INFO in the CGI environment was
-counterintuitive, and could result in crashes in certain cases. In
-Apache 1.2 and beyond, this behavior has changed. Although this
-results in some compatibility problems with certain legacy CGI
-applications, the Apache 1.2 behavior is still compatible with the
-CGI/1.1 specification, and CGI scripts can be easily modified (<A
-HREF="#compat">see below</A>).
-
-<H2><A NAME="prob">The Problem</A></H2>
-
-<P>Apache 1.1.1 and earlier implemented the PATH_INFO and SCRIPT_NAME
-environment variables by looking at the filename, not the URL. While
-this resulted in the correct values in many cases, when the filesystem
-path was overloaded to contain path information, it could result in
-errant behavior. For example, if the following appeared in a config
-file:
-<PRE>
- Alias /cgi-ralph /usr/local/httpd/cgi-bin/user.cgi/ralph
-</PRE>
-<P>In this case, <CODE>user.cgi</CODE> is the CGI script, the "/ralph"
-is information to be passed onto the CGI. If this configuration was in
-place, and a request came for "<CODE>/cgi-ralph/script/</CODE>", the
-code would set PATH_INFO to "<CODE>/ralph/script</CODE>", and
-SCRIPT_NAME to "<CODE>/cgi-</CODE>". Obviously, the latter is
-incorrect. In certain cases, this could even cause the server to
-crash.</P>
-
-<H2><A NAME="solution">The Solution</A></H2>
-
-<P>Apache 1.2 and later now determine SCRIPT_NAME and PATH_INFO by
-looking directly at the URL, and determining how much of the URL is
-client-modifiable, and setting PATH_INFO to it. To use the above
-example, PATH_INFO would be set to "<CODE>/script</CODE>", and
-SCRIPT_NAME to "<CODE>/cgi-ralph</CODE>". This makes sense and results
-in no server behavior problems. It also permits the script to be
-guaranteed that
-"<CODE>http://$SERVER_NAME:$SERVER_PORT$SCRIPT_NAME$PATH_INFO</CODE>"
-will always be an accessible URL that points to the current script,
-something which was not necessarily true with previous versions of
-Apache.
-
-<P>However, the "<CODE>/ralph</CODE>"
-information from the <CODE>Alias</CODE> directive is lost. This is
-unfortunate, but we feel that using the filesystem to pass along this
-sort of information is not a recommended method, and a script making
-use of it "deserves" not to work. Apache 1.2b3 and later, however, do
-provide <A HREF="#compat">a workaround.</A>
-
-<H2><A NAME="compat">Compatibility with Previous Servers</A></H2>
-
-<P>It may be necessary for a script that was designed for earlier
-versions of Apache or other servers to need the information that the
-old PATH_INFO variable provided. For this purpose, Apache 1.2 (1.2b3
-and later) sets an additional variable, FILEPATH_INFO. This
-environment variable contains the value that PATH_INFO would have had
-with Apache 1.1.1.</P>
-
-<P>A script that wishes to work with both Apache 1.2 and earlier
-versions can simply test for the existence of FILEPATH_INFO, and use
-it if available. Otherwise, it can use PATH_INFO. For example, in
-Perl, one might use:
-<PRE>
- $path_info = $ENV{'FILEPATH_INFO'} || $ENV{'PATH_INFO'};
-</PRE>
-
-<P>By doing this, a script can work with all servers supporting the
-CGI/1.1 specification, including all versions of Apache.</P>
-
-<!--#include virtual="footer.html" -->
-</BODY>
-</HTML>
-
Oops, something went wrong.

0 comments on commit d105125

Please sign in to comment.