1
0
mirror of https://github.com/apache/httpd.git synced 2025-08-30 15:01:14 +03:00
Commit Graph

59 Commits

Author SHA1 Message Date
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
Chuck Murcko
64da7b6607 This is 1.3.x current proxy folded 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@86920 13f79535-47bb-0310-9956-ffa450edef68
2000-11-11 11:02:47 +00:00
Ryan Bloom
c1c3267c14 Not all platforms have INADDR_NONE defined by default. Apache used to
check for this and the define it if needed.  Since APR also needs this
check it makes more sense for APR to just check and export a symobl that
is always available.
Submitted by:	Branko �ibej <brane@xbc.nu>
Reviewed by:	Ryan Bloom


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86919 13f79535-47bb-0310-9956-ffa450edef68
2000-11-11 06:06:00 +00:00
William A. Rowe Jr
d6490633eb Renamed all MODULE_EXPORT symbols to AP_MODULE_DECLARE and all symbols
for CORE_EXPORT to AP_CORE_DECLARE (namespace protecting the wrapper)
  and retitled API_EXPORT as AP_DECLARE and APR_EXPORT as APR_DECLARE.
  All _VAR_ flavors changes to _DATA to be absolutely clear.
  Thank you Greg, for the most obvious suggestion.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86609 13f79535-47bb-0310-9956-ffa450edef68
2000-10-16 06:05:15 +00:00
William A. Rowe Jr
eaba82f661 Regardless of reaction to a symbol rename -within- the sources, these
external symbols change for clarity.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86540 13f79535-47bb-0310-9956-ffa450edef68
2000-10-11 17:20:12 +00:00
William A. Rowe Jr
446a7805af Finish the ApacheModuleBleck -> mod_bleck cleanup
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86537 13f79535-47bb-0310-9956-ffa450edef68
2000-10-11 14:26:00 +00:00
William A. Rowe Jr
5c85623192 Missed it, a rather messy canonical error example.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86450 13f79535-47bb-0310-9956-ffa450edef68
2000-10-08 06:05:22 +00:00
Ryan Bloom
260f2cb9c8 Remove all compiler warnings from the proxy code. There are no garauntees
that this still works, but most of the changes were just const-safeness
changes.
PR:	6631


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86440 13f79535-47bb-0310-9956-ffa450edef68
2000-10-08 03:23:05 +00:00
Ryan Bloom
ae7cca1bd9 Remove IOLs from Apache. They are no longer necessary, now that we have
filtering beginning to work.  There is a hack that has been repeated
through this patch, we morph a pipe into a socket, and put the socket
into the BUFF.  Everytime we do that, we are working with a pipe from
a CGI, and we should be creating a pipe bucket and passing that bucket
back.  Because we don't actually have pipe buckets yet, we are using this
hack.  When we get pipe buckets, this will be fixed.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86136 13f79535-47bb-0310-9956-ffa450edef68
2000-08-23 00:01:58 +00:00
Ryan Bloom
ec51d14985 proxy_cache.c was still in the ApacheModuleProxy project, although that
modules is deprecated.  Remove it from the project.
Submitted by:	Bill Rowe <wrowe@apache.org>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86096 13f79535-47bb-0310-9956-ffa450edef68
2000-08-18 04:50:22 +00:00
William A. Rowe Jr
1a9db204f5 Remaining cleanup of ap_ -> apr_ and AP_ -> APR_ transformation...
see src/lib/apr/apr_compat.h for most details.
  Also a few minor nits to get Win32 to build.

PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86008 13f79535-47bb-0310-9956-ffa450edef68
2000-08-06 06:07:53 +00:00
Doug MacEachern
059d8dd212 prefix libapr functions and types with apr_
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85976 13f79535-47bb-0310-9956-ffa450edef68
2000-08-02 05:27:38 +00:00
Ryan Bloom
c266de9029 Remove iol_socket.h. This file had one declaration, and it makes more
sense for that declaraion to move to ap_iol.h.  This also modifies all of
the files that include iol_socket.h to include ap_iol.h


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85934 13f79535-47bb-0310-9956-ffa450edef68
2000-07-29 16:24:15 +00:00
William A. Rowe Jr
847b20108c Add APR_EOL_STR for a platform specific text delimiter, provided by
apr.h (defined in apr.h.in and apr.hw).  This is needed -only- in APR
  created files (true raw files) such as logs.  It is not required in any
  splat to screen (stderr/stdout) formatting, nor any html markup.

  Some other modules slipped through in the prior apr_strings.h commit.
  Sorry 'bout that.

PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85878 13f79535-47bb-0310-9956-ffa450edef68
2000-07-25 01:06:32 +00:00
Jeff Trawick
db3c12a79e Fix some bad ap_log_error() invocations. Comment on a bad
ap_log_rerror() invocation.

Almost all of this is in code never compiled.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85860 13f79535-47bb-0310-9956-ffa450edef68
2000-07-17 22:11:47 +00:00
Ryan Bloom
114fb2e4ac Combine some common code. Before this, all platforms implemented their
own iol_sockets using APR.  This just combines all of that code to a
common file and moves that file to main.  I have tested this with all of
the Unix MPM's, but I am willing to bet I missed something (Makefiles) for
Windows, and possibly moving some code for OS/2 and BeOS.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85732 13f79535-47bb-0310-9956-ffa450edef68
2000-06-30 18:08:13 +00:00
Jeff Trawick
adbb76a60b ignore some generated files in pcre and modules/proxy
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85628 13f79535-47bb-0310-9956-ffa450edef68
2000-06-20 13:25:27 +00:00
Chuck Murcko
54c34b3ea7 fixups for remaining current warnings
Submitted by:	Chuck Murcko


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85563 13f79535-47bb-0310-9956-ffa450edef68
2000-06-13 06:17:47 +00:00
Chuck Murcko
54a3c92ce6 OK, this builds and is autoconf safe about system headers, until it starts
using APR
PR:
Obtained from:
Submitted by:	Chuck Murcko
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85562 13f79535-47bb-0310-9956-ffa450edef68
2000-06-13 01:22:09 +00:00
Ryan Bloom
a1a3b578a5 Fix the configuration process. If no modules are specified in a given
directory, then that directory is no longer added to the build process.
Also, I have added a .cvsignore to the file_cache directory and removed
a generated file from this directory.  Finally, I have removed
some unnecessary checks from the config.m4 files.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85561 13f79535-47bb-0310-9956-ffa450edef68
2000-06-13 01:22:06 +00:00
Ryan Bloom
47df25ba18 Mod_proxy should not be a default module... yet. :-)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85557 13f79535-47bb-0310-9956-ffa450edef68
2000-06-12 22:49:53 +00:00
Chuck Murcko
469a91db1b resolved conflicts (2) in PASV handling from original commit
PR:
Obtained from:
Submitted by:	Chuck Murcko
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85556 13f79535-47bb-0310-9956-ffa450edef68
2000-06-12 22:13:08 +00:00
Chuck Murcko
db096af6a5 New mod_proxy/mod_cache (file cache) for 2.0. This uses a caching API so
that shared mem, LDAP servers, DBs, etc. can also be used for proxy
caching. The caching API is very young, and subject to change as APR changes.

proxy_cache.c from the proxy subdir is no longer used.

Build with --enable-modules=proxy,cache

Lightly tested on Linux, no warranties expressed or implied yet.

Still to do:

strerror(), waitpid(), stat() cleanups
address issues marked by @@@FIXME
add HTTP/1.1

This should be considered a *reference* proxy implementation for 2.0. What
actually ends up shipping with 2.0 is likely going to be rather different as
the redesign evolves. This may end up being the 2.0 backwards compatibility
workalike.

Modified to work with today's conf/build/layout scheme

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


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85552 13f79535-47bb-0310-9956-ffa450edef68
2000-06-12 21:41:58 +00:00
Ryan Bloom
9803fc27fd Remove all occurances of strerror from Apache. ap_strerror works just
fine with standard errno values, and it is more portable.  This also allows
me to remove the check for strerror from Apache's configure script.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85486 13f79535-47bb-0310-9956-ffa450edef68
2000-06-09 18:57:16 +00:00
William A. Rowe Jr
639ee3f71d PR:
Obtained from:
Submitted by:
Reviewed by:

  Simple change to make these consistent with the other Apache module
  build files.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85328 13f79535-47bb-0310-9956-ffa450edef68
2000-05-28 03:58:12 +00:00
William A. Rowe Jr
da493b8be1 PR:
Obtained from:
Submitted by:
Reviewed by:

  Reverse out all _EXPORT_VAR changes back to their original _VAR_EXPORT
  names for linkage (API_, CORE_, and MODULE_).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85318 13f79535-47bb-0310-9956-ffa450edef68
2000-05-27 22:40:44 +00:00
William A. Rowe Jr
86e2a18f2a This patch corrects the issues from the AP_EXPORT and linkage
specification arguments to the ap_hooks.h declarations.  As with
  the APR_ and AP_ patches, API_VAR_EXPORT becomes API_EXPORT_VAR,
  and MODULE_VAR_EXPORT becomes MODULE_EXPORT_VAR.

  I will be happy to revert the inclusion of ap_config.h from 
  httpd.h if this bothers anyone.  More individual modules need
  to be patched if we do so.

  The API_EXPORTs all moved into central storage in the ap_config.h
  header.  Without WIN32 or API_STATIC compile time declarations, 
  these macros remain no-ops.

  This patch also moves the following data from http_main to http_config:

    const char *ap_server_argv0;
    const char *ap_server_root;
    ap_array_header_t *ap_server_pre_read_config;
    ap_array_header_t *ap_server_post_read_config;
    ap_array_header_t *ap_server_config_defines;

  And the following variables had already moved into ap_hooks.c:

    ap_pool_t *g_pHookPool;  (initialized now in http_config)
    int g_bDebugHooks;                   (out of http_config)
    const char *g_szCurrentHookName;     (out of http_config)

  The changes to http_main.c are in preparation for that module to
  move out to a seperate .exe for win32.  Other platforms will be
  unaffected, outside of these changes.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85309 13f79535-47bb-0310-9956-ffa450edef68
2000-05-27 05:28:02 +00:00
William A. Rowe Jr
ed7378f2ec PR:
Obtained from:
Submitted by:
Reviewed by:

  All waiting to bite us... just go ahead and ignore this commit.  Better
  now that when we are deciphering real changes.  This knocks all the
  projects into what I expect is a clean VC6 format.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85301 13f79535-47bb-0310-9956-ffa450edef68
2000-05-26 05:09:17 +00:00
Bill Stoddard
2745ccdaf8 Win32: Convert ap_proc_t to tranparent type.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85292 13f79535-47bb-0310-9956-ffa450edef68
2000-05-24 23:45:37 +00:00
William A. Rowe Jr
e2cb3c6457 Current and clean make files for Win95. Changes Include:
All projects link incrementally with no link maps in Debug mode.
  New cvstodsp6.pl and dsp6tocvs.pl will fix up /the /ZI - /Zi issue.
  Includes corrections noted by Tim Costello


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85254 13f79535-47bb-0310-9956-ffa450edef68
2000-05-19 05:09:20 +00:00
William A. Rowe Jr
7d4602b4ae PR:
Obtained from:
Submitted by:	William Rowe
Reviewed by:

  First round of .cvsignore changes for Win32's droppings


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85086 13f79535-47bb-0310-9956-ffa450edef68
2000-04-28 19:58:06 +00:00
Doug MacEachern
2f45db7e82 back out APR_ prefix for TRUE,FALSE
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85081 13f79535-47bb-0310-9956-ffa450edef68
2000-04-28 18:27:55 +00:00
Doug MacEachern
f3a4cf49be prefix TRUE,FALSE with APR_
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85074 13f79535-47bb-0310-9956-ffa450edef68
2000-04-28 06:49:53 +00:00
Roy T. Fielding
7cbb1cb050 Finished move of ap_md5 routines to apr_md5. Removed ap_md5.h.
Replaced more magic numbers with MD5_DIGESTSIZE.  Yuck.

Submitted by:	William Rowe, Roy Fielding


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85017 13f79535-47bb-0310-9956-ffa450edef68
2000-04-23 02:32:58 +00:00
Bill Stoddard
9a6e32864a Add ApacheModAuthDigest to apache.dsw. Get rid of compile warnings.
Submitted by:	William Rowe
Reviewed by:	Bill Stoddard


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85014 13f79535-47bb-0310-9956-ffa450edef68
2000-04-22 15:44:57 +00:00
Bill Stoddard
17c5e3fb7a Revamp the Win32 make environment. Makefiles have been removed and
Apache.dsw created to bring together all the pieces. Create new file
os/win32/BaseAddr.ref to define module base addresses (to prevent
dll relocation at start-up).

Submitted by:	William Rowe
Reviewed by:	Bill Stoddard


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85004 13f79535-47bb-0310-9956-ffa450edef68
2000-04-20 19:28:08 +00:00
Jeff Trawick
cc6e027c47 [EBCDIC] Port Paul Gilmartin's CRLF patch from 1.3. This replaces most
of the \015, \012, and \015\012 constants with macros.
Submitted by:	Greg Ames
Reviewed by:	Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84998 13f79535-47bb-0310-9956-ffa450edef68
2000-04-20 14:36:01 +00:00
Bill Stoddard
e3784eb925 linkwin20.diffs Resolves:
1) Explicit /base: addresses by the following table...

  Required sizes are for debug builds.  It is assumed that
  as we increase the size of aprlib, we will be trimming
  the size of ApacheCore, and the 278A0000 base can move down.

  ApacheCore.dll            27800000  80000 required

  aprlib.dll                278A0000  40000 required

  ApacheModuleAuthAnon.dsp  27900000
  ApacheModuleCERNMeta.dsp  27910000
  ApacheModuleDigest.dsp    27920000
  ApacheModuleExpires.dsp   27930000
  ApacheModuleHeaders.dsp   27940000
  ApacheModuleInfo.dll      27950000
  ApacheModuleRewrite.dsp   27960000  20000 required

  ApacheModuleSpeling.dsp   27980000
  ApacheModuleStatus.dsp    27990000
  ApacheModuleUserTrack.dsp 279A0000
  ApacheModuleProxy.dsp     279B0000  20000 anticipated

  3 slots still available   279C0000

2) Make APR consistent with the rest of the API and
   not build septypes for debugging (in other words,
   roll in the debug symbols as every other module does.)

   If we decide we LIKE /pdbtype:septypes... then we
   should be using them throughout.

3) Slide the current path specs into /libpath: options
   so the library list is more ledgible.

4) Drop all the gui crud from the library list.  Everything
   listed is referenced, with the following exceptions:

   *) don't do anything with msvcrtd/oldnames today.
   *) aprlib and ApacheCore have the same list, since functions
      may still be moving between them.
   *) apache.exe looses networking (it doesn't), while it keeps
      advapi, which I don't think it needs, but it could later.
   *) add aprlib to ApacheModuleProxy, since it will need it.
   *) hang mswsock whereever ws2_32 is invoked.  I believe
      the most special case was ApacheModuleProxy, which may
      become entirely APR.  But for today we hang onto both.

5) MAP, MAP, MAP, everything gets a map.  I for one have an
   untold number of installed OS's and boot mappings, and the
   debugger isn't installed to all of them.  We gotta be able
   to track down those renegade GP faults.  (What faults...
   I know, it's clean, but I am overly cautious that way.)

6) Set the DEFAULT linkage to be this linkage.  Because
   "it's a vc thing" the defaults were not all that
   useful as a starting point (take, for example, the
   joke of linking to the OLE libraries).


Submitted by:	William Rowe


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84982 13f79535-47bb-0310-9956-ffa450edef68
2000-04-17 13:56:41 +00:00
Ryan Bloom
de3a77dc01 Change ap_context_t to ap_pool_t. This compiles, runs, and serves pages
on Linux, but probably breaks somewhere.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84963 13f79535-47bb-0310-9956-ffa450edef68
2000-04-14 15:59:20 +00:00
Roy T. Fielding
2bee4ad19d Update to Apache Software License version 1.1
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84879 13f79535-47bb-0310-9956-ffa450edef68
2000-03-31 09:05:25 +00:00