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

43 Commits

Author SHA1 Message Date
William A. Rowe Jr
cf28fad4b1 Killing ap_os_is_filename_valid. Left actual win32 code, since it is
moving into apr and the check_safe_file call.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86906 13f79535-47bb-0310-9956-ffa450edef68
2000-11-10 15:29:07 +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
64c0937543 Eliminating a bunch-o-junk from the Win32 os.h header that now lives
in apr or isn't used.  Please review closely (every symbol removed was
  grep't for, and no references were found.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86598 13f79535-47bb-0310-9956-ffa450edef68
2000-10-15 19:38:50 +00:00
William A. Rowe Jr
c792f50d0a Move more path parsing fixes forward from 1.3
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86564 13f79535-47bb-0310-9956-ffa450edef68
2000-10-12 14:22:30 +00:00
William A. Rowe Jr
1abfaec810 New symbol for HAVE_URL_PATHS reminds me we need to prefix a bunch more
symbols with AP_.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86526 13f79535-47bb-0310-9956-ffa450edef68
2000-10-11 04:24:41 +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
Allan K. Edwards
4284045bed Get Win32 building after yesterday's patch to make MPM's explain
where to change compiled-in limits.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85660 13f79535-47bb-0310-9956-ffa450edef68
2000-06-22 19:17:20 +00:00
William A. Rowe Jr
8981debf98 Time for these to be gone? I'd say it's long past :)
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85603 13f79535-47bb-0310-9956-ffa450edef68
2000-06-17 21:06:24 +00:00
Ryan Bloom
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
Ryan Bloom
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
Ryan Bloom
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
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
Ryan Bloom
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
Ryan Bloom
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
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
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
William A. Rowe Jr
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
William A. Rowe Jr
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
William A. Rowe Jr
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
William A. Rowe Jr
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
William A. Rowe Jr
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
William A. Rowe Jr
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
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
Bill Stoddard
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
Roy T. Fielding
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
Bill Stoddard
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
Jeff Trawick
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
Ryan Bloom
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
Bill Stoddard
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
Bill Stoddard
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
Ryan Bloom
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
Bill Stoddard
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
Manoj Kasichainula
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
Manoj Kasichainula
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
Manoj Kasichainula
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
Bill Stoddard
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
Bill Stoddard
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
Bill Stoddard
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
Bill Stoddard
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
Ryan Bloom
c37f14ddf3 Changed pools to contexts. Tested with prefork and pthread mpm's. I'll
check this out tomorrow and make sure everything was checked in correctly.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83852 13f79535-47bb-0310-9956-ffa450edef68
1999-08-31 05:35:52 +00:00
Bill Stoddard
cb7f073d26 A bunch of changes to get the server compiling on WIN32. mod_cgi, mod_include,
mod_isapi and mod_so don't work so I am not making them. Moved a lot of code out
of multithread.*  and into os.* (didn't want to add multithread to the new repository).
Much of this can be cleaned up when APR is stable.

And Dean's gonna but me for sure for the http_main hit. It's may be
possible to name a DLL entry point 'main()'. Just havent tried it yet.

Enjoy!


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83822 13f79535-47bb-0310-9956-ffa450edef68
1999-08-27 22:57:27 +00:00
Roy T. Fielding
f94d181200 Add define for ap_spawnvp. Dean removed obsolete symbols NO_OTHER_CHILD
and NO_RELIABLE_PIPED_LOGS.

Submitted by:	Ryan Bloom, Manoj Kasichainula


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83799 13f79535-47bb-0310-9956-ffa450edef68
1999-08-26 18:11:33 +00:00
Roy T. Fielding
6f96ad5227 Apache 1.3.9 baseline for the Apache 2.0 repository.
Obtained from: Apache 1.3.9 (minus unused files), tag APACHE_1_3_9
Submitted by: Apache Group


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83750 13f79535-47bb-0310-9956-ffa450edef68
1999-08-24 06:46:03 +00:00