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

98 Commits

Author SHA1 Message Date
Victor J. Orlikowski
2b1b546c89 Revert out the build changes made last night. Ryan and Chuck make good points.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88251 13f79535-47bb-0310-9956-ffa450edef68
2001-02-20 19:27:22 +00:00
Chuck Murcko
eef10aed51 Allow proxy to build until we fit a proper build dir
PR:
Obtained from: Victor Orlikowski
Submitted by:
Reviewed by: Chuck Murcko


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88244 13f79535-47bb-0310-9956-ffa450edef68
2001-02-20 00:06:30 +00:00
Chuck Murcko
4251e45081 Fix for moved macros
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88110 13f79535-47bb-0310-9956-ffa450edef68
2001-02-12 09:20:03 +00:00
Ryan Bloom
9d85d10c10 Fix any compile breaks after moving apr_snprintf and apr_vsnprintf to
apr_strings.h


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88077 13f79535-47bb-0310-9956-ffa450edef68
2001-02-11 00:12:43 +00:00
Greg Stein
5dc34feb12 *) continued header revamping
*) torch some headers (and some libs) from the autoconf stuff


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88061 13f79535-47bb-0310-9956-ffa450edef68
2001-02-10 14:04:21 +00:00
Doug MacEachern
88d3406f9a renaming various functions for consistency sake
see: http://apr.apache.org/~dougm/apr_rename.pl
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88019 13f79535-47bb-0310-9956-ffa450edef68
2001-02-08 07:45:33 +00:00
Chuck Murcko
d129951ea5 additions and deletions for proxy in current codebase
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88005 13f79535-47bb-0310-9956-ffa450edef68
2001-02-07 05:42:10 +00:00
Chuck Murcko
c9dc3847d2 Changes to get running on the current codebase
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88004 13f79535-47bb-0310-9956-ffa450edef68
2001-02-07 05:41:35 +00:00
Chuck Murcko
6ced381a98 update for the latest build system
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87987 13f79535-47bb-0310-9956-ffa450edef68
2001-02-06 10:46:23 +00:00
Jeff Trawick
bd424f80f3 ap_new_connection() returns NULL if an error occurred (prefork MPM
and ap_new_connection() were changed last week)

I have skipped putting the change into WinNT MPM and mod_proxy.  I
left a note in the mod_proxy code; for the NT MPM I think I can talk
somebody into doing the right thing for me.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87982 13f79535-47bb-0310-9956-ffa450edef68
2001-02-05 15:04:32 +00:00
William A. Rowe Jr
d038b40a6f Fix the remaining APR_FINFO_NORM occurances. Again, followup is needed
to actually test any field outside the scope of APR_FINFO_MIN.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87935 13f79535-47bb-0310-9956-ffa450edef68
2001-01-31 23:11:05 +00:00
William A. Rowe Jr
cd1ef027c2 The changes required for the APR_FINFO_wanted argument to
apr_stat/lstat/getfileinfo.  These are -NOT- optimal, they
  are simply the required changes to get the server working.
  The size of the patch is a warning about how we need to
  really look at what we are trying to accomplish with all
  of these stat/lstat calls.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87760 13f79535-47bb-0310-9956-ffa450edef68
2001-01-20 21:42:23 +00:00
William A. Rowe Jr
59bbd68bec The big change. This is part 3 of the apr-util symbols rename, please
see the first commit of srclib/apr-util/include (cvs apr-util/include)
  for the quick glance at symbols changed.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87731 13f79535-47bb-0310-9956-ffa450edef68
2001-01-19 07:04:36 +00:00
William A. Rowe Jr
40655f8641 Provide apr_pool_t arg to register_hooks, since anything they do in that
step -must- be done with a pool that will not outlive the cmd pool, from
  which they may have been dynamically loaded.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87697 13f79535-47bb-0310-9956-ffa450edef68
2001-01-17 15:52:12 +00:00
William A. Rowe Jr
8a5e3208d9 Last of the Win32 goodness I've noticed
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87503 13f79535-47bb-0310-9956-ffa450edef68
2000-12-21 21:07:18 +00:00
William A. Rowe Jr
c876e8476a Out of the sandbox and into prime time. Note... these should always and
only be regenerated immediately prior to the tag and roll.  Do not assume
  they are current with the sources in the development tree.  They should
  be generated as vc5 make files, since only vc5 makefiles are readable by
  both vc5 and vc6.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87479 13f79535-47bb-0310-9956-ffa450edef68
2000-12-21 01:46:22 +00:00
William A. Rowe Jr
0a37cdf9fe Correction, commited the vc5. Need vc6 in the tree. Humble appologies.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87475 13f79535-47bb-0310-9956-ffa450edef68
2000-12-21 01:25:10 +00:00
William A. Rowe Jr
4315b0c706 The Win32 overhaul, in summary;
Modules are named mod_foo.so
    Dynamic Libraries are named libfoo.dll, and are stored in bin/
    The former ApacheCoreDll is now libhttpd.dll
    Apache.exe moves to bin/
    The make install now copies include, lib, and libexec
    All build options are normalized, filenames adjusted appropriately


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87471 13f79535-47bb-0310-9956-ffa450edef68
2000-12-21 01:04:49 +00:00
Jeff Trawick
351725e726 Switch to the APR-provided APR_CHARSET_EBCDIC feature test macro.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87460 13f79535-47bb-0310-9956-ffa450edef68
2000-12-20 16:44:01 +00:00
Ryan Bloom
b5440c348a Force all Apache functions to be linked into the executable, whether they
are used or not.  This uses the same mechanism that is used for APR
and APR-util.  This may not be the correct solution, but it works, and that
is what I really care about.  This also renames CHARSET_EBCDIC to
AP_CHARSET_EBCDIC.  This is for namespace correctness, but it also makes
the exports script a bit easier.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87424 13f79535-47bb-0310-9956-ffa450edef68
2000-12-19 17:05:48 +00:00
Jeff Trawick
c17ef15818 API routines ap_pgethostbyname() and ap_pduphostent() are no longer
available.  Use apr_getaddrinfo() instead.

The ap_pduphostent() code was moved to modules/proxy/proxy_util.c for
now since that is the only caller.  When the proxy's use of the
resolver is APR-ized this won't be needed anymore.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87399 13f79535-47bb-0310-9956-ffa450edef68
2000-12-18 17:52:05 +00:00
Greg Stein
9787943f19 *) remove STANDARD_LIBS line; it is unused/unneeded
*) simplify by removing the extra AC_DEFUN() in each file


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87247 13f79535-47bb-0310-9956-ffa450edef68
2000-12-07 10:40:01 +00:00
William A. Rowe Jr
bf57cf0335 The -big- fix, all the proper linkages for BaseAddr.ref plus a bit.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87221 13f79535-47bb-0310-9956-ffa450edef68
2000-12-05 20:36:03 +00:00
William A. Rowe Jr
56560e4293 A bit of inclusion for the apr-util package.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87213 13f79535-47bb-0310-9956-ffa450edef68
2000-12-05 17:38:40 +00:00
William A. Rowe Jr
f119cafbaa This patch illustrates the new locations, and makes the majority of the
adjustments.  Now to actually try to build the thing.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87212 13f79535-47bb-0310-9956-ffa450edef68
2000-12-05 16:37:50 +00:00
Jeff Trawick
4c8baf6170 Get rid of ap_new_apr_connection(). ap_new_connection() now has
fewer parameters: the local and remote socket addresses were removed
from the parameter list because all required information is available
via the APR socket.

I haven't tested the most important part -- the WinNT MPM changes
-- but it compiles and it looks okay :)  If the WinNT MPM works on
Win98 these days let me know.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87181 13f79535-47bb-0310-9956-ffa450edef68
2000-12-04 19:24:10 +00:00
Jeff Trawick
d4df2029ae updates to changed interfaces to apr_set_port(), apr_get_port(),
apr_set_ipaddr(), and apr_get_ipaddr()


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87050 13f79535-47bb-0310-9956-ffa450edef68
2000-11-21 19:10:25 +00:00
Jeff Trawick
69142afea0 ignore generated files .libs and *.la
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87044 13f79535-47bb-0310-9956-ffa450edef68
2000-11-21 12:26:20 +00:00
Chuck Murcko
ac560d6d90 Restore Ryan's original intent in ap_proxy_doconnect() return value check
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87034 13f79535-47bb-0310-9956-ffa450edef68
2000-11-20 18:10:19 +00:00
Jeff Trawick
0caf561799 Call apr_create_socket() instead of apr_create_tcp_socket() (deprecated).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87025 13f79535-47bb-0310-9956-ffa450edef68
2000-11-19 14:27:45 +00:00
Jeff Trawick
ff3ed2541f Change apr_bind() to take apr_sockaddr_t.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87024 13f79535-47bb-0310-9956-ffa450edef68
2000-11-19 14:24:20 +00:00
Ryan Bloom
e56d9d5baf Begin to remove some of the cache-ing logic from the http proxy.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87013 13f79535-47bb-0310-9956-ffa450edef68
2000-11-18 17:13:29 +00:00
Ryan Bloom
66078e0d34 More proxy fixes. There are still some bugs in this code, but this has
successfully proxied www.yahoo.com and www.ntrnet.net among other test
sites that I chose at random.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87001 13f79535-47bb-0310-9956-ffa450edef68
2000-11-18 03:17:21 +00:00
Chuck Murcko
2588d59598 fix apr_getaddrinfo() call
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86994 13f79535-47bb-0310-9956-ffa450edef68
2000-11-17 17:26:32 +00:00
Jeff Trawick
3463c8ca6c APR: Change apr_connect() to take apr_sockaddr_t instead of hostname.
Add generic apr_create_socket().  Add apr_getaddrinfo() for doing
hostname resolution/address string parsing and building
apr_sockaddr_t.
Submitted by:	David Reid
Reviewed by:	Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86990 13f79535-47bb-0310-9956-ffa450edef68
2000-11-17 03:45:02 +00:00
Ryan Bloom
4baadb8ef1 This removes all BUFF's from the HTTP proxy. This code is relatively
ugly, but it does proxy pages.  This even fixes the content-type bug
that I introduced yesterday sometime.  As soon as BUFF is removed from
the FTP proxy, the buff.c and buff.h files need to go away.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86988 13f79535-47bb-0310-9956-ffa450edef68
2000-11-17 00:19:30 +00:00
Ryan Bloom
274c566f2b Make the proxy work with filters. We are still using BUFF for the
back-end communication, but BUFF has been removed from the communication
with the client.  The headers are not working correctly yet, but we are
making progress.  The most important part of this commit is that we are
able to actually filter data coming from the proxy.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86978 13f79535-47bb-0310-9956-ffa450edef68
2000-11-16 01:57:46 +00:00
Ryan Bloom
b227aa8c6e Remove BUFF from the CONNECT handler. This works as well as the rest
of the proxy, meaning that it has proxied a page.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86967 13f79535-47bb-0310-9956-ffa450edef68
2000-11-14 23:58:54 +00:00
Ryan Bloom
b91450f752 Get the proxy to look at requests that are being proxied again. In the
big commit of the other day, a few !r->proxyreq's were changed to
r->proxyreq, which made the proxy decline requests when it shouldn't
have.
Submitted by:	Cliff Woolley <cliffwoolley@yahoo.com>
Reviewed by:	Ryan Bloom


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86966 13f79535-47bb-0310-9956-ffa450edef68
2000-11-14 22:28:56 +00:00
Chuck Murcko
2b8f7395d7 Changes for previous ap_proxy_doconnect() calling
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86963 13f79535-47bb-0310-9956-ffa450edef68
2000-11-14 19:32:03 +00:00
Ryan Bloom
6ec843d62c Get the proxy working again. With this change in, I have successfully
proxied a page from perl.apache.org.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86962 13f79535-47bb-0310-9956-ffa450edef68
2000-11-14 18:27:58 +00:00
Chuck Murcko
4f9a6f576e Simplify ap_proxy_doconnect(); now returns apr_status_t
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86961 13f79535-47bb-0310-9956-ffa450edef68
2000-11-14 17:15:11 +00:00
Ryan Bloom
91f3b21aa6 The whole proxy compiles cleanly now. Now we need to make it actually work
again, but at least we are making progress.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86928 13f79535-47bb-0310-9956-ffa450edef68
2000-11-11 18:34:10 +00:00
Ryan Bloom
c0fe0a6dfb proxy_ftp and proxy_http both compile now. Not tested because the rest of
the proxy is still not compiling, but we are making progress.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86927 13f79535-47bb-0310-9956-ffa450edef68
2000-11-11 18:13:04 +00:00
Ryan Bloom
cac411d0cc Make proxy_connect.c compile cleanly again. Not sure if it works or not,
but it does compile.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86926 13f79535-47bb-0310-9956-ffa450edef68
2000-11-11 17:51:58 +00:00
Chuck Murcko
a336184f5c Pick up buff.h for the moment, now to get the conn_rec changes from the last
few days taken care of.

PR:
Obtained from: Chuck Murcko
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86925 13f79535-47bb-0310-9956-ffa450edef68
2000-11-11 11:54:10 +00:00
Chuck Murcko
1fabe685e2 Fix small thinko in void funcs
PR:
Obtained from: Chuck Murcko
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86924 13f79535-47bb-0310-9956-ffa450edef68
2000-11-11 11:12:22 +00:00
Chuck Murcko
31c42a957c This is the 1.3.x current proxy into 2.0 - first stage
PR:
Obtained from: Sam Magnuson
Submitted by:  Chuck Murcko
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86923 13f79535-47bb-0310-9956-ffa450edef68
2000-11-11 11:07:03 +00:00
Chuck Murcko
adebe63463 This is the 1.3.x current proxy into 2.0 - first stage
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86922 13f79535-47bb-0310-9956-ffa450edef68
2000-11-11 11:05:18 +00:00
Chuck Murcko
2852402f1c This is the 1.3.x current proxy code into 2.0.
PR:
Obtained from: Sam Magnuson
Submitted by:	Chuck Murcko
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86921 13f79535-47bb-0310-9956-ffa450edef68
2000-11-11 11:03:42 +00:00