Commit Graph

57 Commits

Author SHA1 Message Date
29faf4133c Fix Win32 compile break caused by Ryan's stat cleanup.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85544 13f79535-47bb-0310-9956-ffa450edef68
2000-06-12 18:07:31 +00:00
16748b4e22 Remove the final vestiges of stat.h from Apache 2.0. All calls are now to
ap_stat.  This also adds the new function ap_lstat().  This function is
analogous to lstat.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85535 13f79535-47bb-0310-9956-ffa450edef68
2000-06-12 15:29:09 +00:00
8a9a5b90ac Cleanup more of the Apache configuration. This removes all of the shared
memory checks, because Apache relies completely on APR for shared memory
support.  In doing this, we also need to know how APR/MM are providing
our shared memory (ie file or memory) that requires the change made to
APR's configure script that was just committed.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85501 13f79535-47bb-0310-9956-ffa450edef68
2000-06-10 16:15:08 +00:00
6b6800fd85 Remove a bunch of string functions from Apache. These are basically
standard string functions like strstr, strcasecmp, etc that Apache used
to define for platforms that don't have them.  These functions and the
feature tests have moved down to APR where they really belong.  In doing
this, I am also able to remove a bunch of tests from the Apache configure
process.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85487 13f79535-47bb-0310-9956-ffa450edef68
2000-06-09 21:19:52 +00:00
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
9b90f11c5f Cleanup APR header files a bit. Basically, this splits ap_table_t related
functions into their own header file, away from apr_pools.h.  At the same
time as I was doing this, I removed a couple of definitions that aren't
used anywhere anymore, like ap_child_info_t.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85473 13f79535-47bb-0310-9956-ffa450edef68
2000-06-08 19:29:40 +00:00
cc8eeb2d84 Remove all occurances of gettimeofday. Replace it with ap_now which
provides the same function but works cross-paltform.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85463 13f79535-47bb-0310-9956-ffa450edef68
2000-06-08 00:28:35 +00:00
75f76def88 Fix Win32 bug when pathname length exactly equals MAX_PATH.
This bug caused directory index to be displayed rather than
returning an error.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85461 13f79535-47bb-0310-9956-ffa450edef68
2000-06-07 22:50:15 +00:00
343754d3f2 PR:
Obtained from:
Submitted by:
Reviewed by:

  Just two quick fixes for the ApacheCore/ApacheCoreDll.dsp project split.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85438 13f79535-47bb-0310-9956-ffa450edef68
2000-06-06 01:55:44 +00:00
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
e66f7255c4 PR:
Obtained from:
Submitted by:
Reviewed by:

  Just cleaning up API_EXPORT...


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85306 13f79535-47bb-0310-9956-ffa450edef68
2000-05-26 18:58:43 +00:00
40b92feb96 Fixes to allow Apache to run as a Win95 service... highlights
main_win32.h : Moved delarations to a header, by request
  ap_listen.h :  References types declared in http_config.h
  http_main.h :  Add the Win32 flavor entry point declaration
  apr.hw :       Cleanup the redundancy department of redundancy 
  win32/proc.c : Double null termination was required here
  
  Everything else should be obvious and isolated to Win32.
  Build files will be committed seperately.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85253 13f79535-47bb-0310-9956-ffa450edef68
2000-05-19 05:01:53 +00:00
710c1945d1 Cleanup ap_config.h fallout for Win32. Only a few very minor
changes to ap_config.h and util.c, but they might hurt someone...
  please watch those two carefully.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85237 13f79535-47bb-0310-9956-ffa450edef68
2000-05-17 01:52:48 +00:00
44f9229e2e PR:
Obtained from:
Submitted by:
Reviewed by:

    Just a plain old screwup.  If someone can give me syntax to backout
    a change rather than reverse it, I'd be much obliged


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85236 13f79535-47bb-0310-9956-ffa450edef68
2000-05-17 00:45:05 +00:00
9bfb956e51 Radical overhaul of the Apache-2.0/Win32 mpm <-> service schema.
1) Services and Registry are not part of the core Apache operations,
     so registry.c and service.c are moved into Apache.exe - assuring
     the service control layers of NT and 95 are truly isolated.

  2) Isolation can't be complete, we need to know when the mpm is
     fully initialized.  A new pointer to a no-arg function returning
     void is provided for this purpose, ap_mpm_init_complete.  It is
     only called if overridden with a non-NULL value prior to invoking
     apache_main.

  3) Control+C, Control+Break are handled on both WinNT and Win9x.

  4) The window close, logoff and shutdown events are handled on WinNT.

  5) The beginnings of a Win95 service startup are provided, -k startservice
     but this is horribly incomplete since Win95 will NOT report shutdown.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85235 13f79535-47bb-0310-9956-ffa450edef68
2000-05-17 00:35:21 +00:00
4a43910616 PR:
Obtained from:
Submitted by:
Reviewed by:

  A leftover I noticed cleaning up based addresses for 1.3.x


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85188 13f79535-47bb-0310-9956-ffa450edef68
2000-05-11 04:03:37 +00:00
adc0efc8c6 pcre lives and dies on the _WIN32 define, rather than WIN32...
Adjusted os/win32/os.h to always declare _WIN32, and fixed up
  some goodies.  Win32 now serves pages.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85163 13f79535-47bb-0310-9956-ffa450edef68
2000-05-06 16:09:10 +00:00
6d9adaf3a8 Significantly shorten the Win32 build and shrink symbol tables
for precompiled headers and debugging by eliminating large chunks
  of the windows.h declarations, especially the graphical user
  interface declarations.

  Also eliminates redundant inclusion of winsock and windows headers.
  As the GUI sections can be included by adding the windows.h include
  prior to any apr headers, these includes now imply something
  completely different.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85117 13f79535-47bb-0310-9956-ffa450edef68
2000-05-01 14:40:03 +00:00
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
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
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
150b558088 Replace ERROR constant with TODO_ERROR to flag these for review.
ERROR is a Windows.h constant of 0, or success, and is unrelated
  to the error codes!


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85071 13f79535-47bb-0310-9956-ffa450edef68
2000-04-28 05:50:17 +00:00
f7900eb9cf Replace ERROR constant with TODO_ERROR to flag these for review.
ERROR is a Windows.h constant of 0, or success, and is unrelated
  to the error codes!


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85070 13f79535-47bb-0310-9956-ffa450edef68
2000-04-28 05:41:36 +00:00
2f6ab67bce First cut at a file handle cache. It serves on Windows and should work on
Unix systems that implement sendfile.

It is still very rough around the edges (compile warnings, does an unnecessary
stat, not completely Unix friendly, leftover mod_mmap_static code, etc.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85020 13f79535-47bb-0310-9956-ffa450edef68
2000-04-23 17:42:22 +00:00
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
5eabf6240b Win32: Get mod_auth_digest compiling and added to the Windows
build environment. Not tested and I'd be suprised if it
actually works.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85012 13f79535-47bb-0310-9956-ffa450edef68
2000-04-21 22:12:43 +00:00
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
16e366cbfe Win32: First cut at getting mod_isapi working under 2.0
Submitted by:	William Rowe


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84976 13f79535-47bb-0310-9956-ffa450edef68
2000-04-15 19:23:08 +00:00
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
2e7ac8ac5f Get APR DSO code working under Windows
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84898 13f79535-47bb-0310-9956-ffa450edef68
2000-04-03 20:41:14 +00:00
1be5367573 Update to Apache Software License version 1.1
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84880 13f79535-47bb-0310-9956-ffa450edef68
2000-03-31 09:17:18 +00:00
6805222021 Do a bit of Win32 specific garbage collecting. Most of os.h (of not all
of it) should go away eventually, merged into APR. Seems useful to delete
the obvious garbage first.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84832 13f79535-47bb-0310-9956-ffa450edef68
2000-03-24 05:03:22 +00:00
914b0b7077 axe some deprecated MULTITHREAD code
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84825 13f79535-47bb-0310-9956-ffa450edef68
2000-03-22 11:36:52 +00:00
b1c26f031a Fix all the License issues. Including:
s/Apache Group/Apache Software Foundation/
s/1999/2000/
s/Sascha's license/ASF license


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84725 13f79535-47bb-0310-9956-ffa450edef68
2000-03-10 00:07:37 +00:00
79a3fc6507 Remove dead code.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84616 13f79535-47bb-0310-9956-ffa450edef68
2000-02-13 00:13:32 +00:00
a452d1f152 Fix compile breaks on Windows.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84512 13f79535-47bb-0310-9956-ffa450edef68
2000-01-23 16:37:46 +00:00
a8ce196da5 Finish the commits for the change in the header files. Basically, this hides
all of the Apache macros that modules don't need access to.  This should
have been committed with the modules, but I wasn't paying attention to the
directory I was in when I ran the commit.
Submitted by:	Manoj Kasichainula and Ryan Bloom


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84493 13f79535-47bb-0310-9956-ffa450edef68
2000-01-19 01:16:31 +00:00
d1451eb401 Update Windows port to new file_io and time specs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84483 13f79535-47bb-0310-9956-ffa450edef68
2000-01-17 19:37:55 +00:00
afeeaeedcb Include mod_include and mod_so in the Windows build.
Submitted by:   Allan Edwards
Reviewed by:	Ryan Bloom


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84307 13f79535-47bb-0310-9956-ffa450edef68
1999-12-16 15:46:17 +00:00
7713abd338 Add license statement to util_win32.c
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84251 13f79535-47bb-0310-9956-ffa450edef68
1999-12-08 23:56:33 +00:00
5ef0434230 Delete remnants of ap_spawnvp that got missed earlier.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84194 13f79535-47bb-0310-9956-ffa450edef68
1999-11-30 05:56:17 +00:00
3cfe8158af Deal with times() properly in autoconf. This also changes NO_TIMES to
!HAVE_TIMES.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84193 13f79535-47bb-0310-9956-ffa450edef68
1999-11-30 03:52:57 +00:00
a7a251cb29 The first part of the big autoconf patch. This replaces a bunch of
NEED_* macros with HAVE_* macros to be more consistent with autoconf.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84186 13f79535-47bb-0310-9956-ffa450edef68
1999-11-29 23:33:24 +00:00
ee53e27fb6 First cut at adding a sendfile API to IOL. Eventually need to move iol_socket
into APR...


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84089 13f79535-47bb-0310-9956-ffa450edef68
1999-11-02 14:30:23 +00:00
50d0f1d8f7 Add mod_cgi back into the Win32 build
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83994 13f79535-47bb-0310-9956-ffa450edef68
1999-10-14 14:01:16 +00:00
8c18eee13a Remove most of the annoying "re ap_context_t mplement" mis-replacements
by what I think is their real meaning. Guys, I didn't verify all of this,
please have a close look at my "fixes". Thanks.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83970 13f79535-47bb-0310-9956-ffa450edef68
1999-10-11 22:40:18 +00:00
018feacc4b Make Apache use the new ap_create_process call. This is the first of a
group of patches.  This patch, allows the core server to compile and
serve pages.  There is a set of patches which will follow to allow the
standard modules to use ap_create_process.  This change should make
writing code which spawns new processes easy to read and understand.
Submitted by:	Paul Reder


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83959 13f79535-47bb-0310-9956-ffa450edef68
1999-10-11 14:20:48 +00:00
084697c3ae Add a couple of missing function declarations
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83932 13f79535-47bb-0310-9956-ffa450edef68
1999-10-05 06:01:32 +00:00
4d628b8cdb Cut out cruft... More APR'izing...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83900 13f79535-47bb-0310-9956-ffa450edef68
1999-09-13 18:30:32 +00:00
e400447191 A bit of WIN32 header file cleanup
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83897 13f79535-47bb-0310-9956-ffa450edef68
1999-09-13 14:07:22 +00:00