1
0
mirror of https://github.com/apache/httpd.git synced 2025-09-02 13:21:21 +03:00
Commit Graph

92 Commits

Author SHA1 Message Date
Allan K. Edwards
e79d8703be repair cgi's on Windows
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86964 13f79535-47bb-0310-9956-ffa450edef68
2000-11-14 22:02:07 +00:00
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
2bf04d2053 Get everything working with suexec patches again.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86731 13f79535-47bb-0310-9956-ffa450edef68
2000-10-24 11:54:29 +00:00
William A. Rowe Jr
fead05f0bf expatlib is definately more in sync with the Unix build, so we now
build the expatlib.dsp rather than seperate xmltok/xmlparse .dsp's.

Submitted by:	Greg Stein
Reviewed by:	William Rowe


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86644 13f79535-47bb-0310-9956-ffa450edef68
2000-10-18 17:37:05 +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
e6668f5a87 Change to buckets for isapi output. Still requires emulation of IO
Completion/Async behavior, but a non-async REQ_HSE_TRANSMIT_FILE is
  now implemented.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86592 13f79535-47bb-0310-9956-ffa450edef68
2000-10-14 23:18:52 +00:00
William A. Rowe Jr
a286d71463 Completes the port of the <Directory /> handling for Win32... there is
still a patch needed for OS2 ... Brian?


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86579 13f79535-47bb-0310-9956-ffa450edef68
2000-10-13 16:57:21 +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
d68fd097f6 Get rid of some darned ugly exception lists
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86538 13f79535-47bb-0310-9956-ffa450edef68
2000-10-11 16:53:43 +00:00
William A. Rowe Jr
a14d772aa7 Preparing the way.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86530 13f79535-47bb-0310-9956-ffa450edef68
2000-10-11 07:45:34 +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
William A. Rowe Jr
d16cd788f2 Just cleaning house and assuring there is nothing untword in the alpha.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86459 13f79535-47bb-0310-9956-ffa450edef68
2000-10-08 23:52:06 +00:00
William A. Rowe Jr
9dcd313a9f Movin on over from 1.3.13-dev : this patch fixes the problem of nasty
popup windows alerting an Admin that the isapi isn't working, and
  simplifies mod_isapi by relying on dso.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86447 13f79535-47bb-0310-9956-ffa450edef68
2000-10-08 06:00:26 +00:00
William A. Rowe Jr
b15f501b16 Roll forward fixes identified for 1.3.13-dev.
Note... this module still needs more control over async emulation, etc.

Submitted by:	Jesse Pelton [jsp@PKC.com]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86422 13f79535-47bb-0310-9956-ffa450edef68
2000-10-06 22:33:44 +00:00
William A. Rowe Jr
cbd58ab0bd Here it is, the Win32 part of the big canonical errors patch.
The reason is really, really simple.  If we ever choose to mix clib and
  dos error codes, they criss-cross and don't line up, but they share the
  same number space.  As I wrote the new APR_IS_ERROR macros, I realized
  we were about to shoot ourselves in the foot.

  These changes nearly entirely affect Win32 only.  The next big patch will
  affect all of the rv == APR_ENOENT type problems throughout the system.

PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86416 13f79535-47bb-0310-9956-ffa450edef68
2000-10-06 17:24:43 +00:00
William A. Rowe Jr
86878efb04 Fix a few colliding modules
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86374 13f79535-47bb-0310-9956-ffa450edef68
2000-10-03 06:55:06 +00:00
William A. Rowe Jr
134a70e4bd Ok... I've been waiting to find out what happens when we commit to two
trees at once.  To that end, this is the caching and rather stable 2.0
  mod_isapi, with the docs brought over from 1.3 and freshened a bit.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86373 13f79535-47bb-0310-9956-ffa450edef68
2000-10-03 06:08:36 +00:00
William A. Rowe Jr
532f7b3f39 Whoops... that there was a handle I left hanging (and growing).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86369 13f79535-47bb-0310-9956-ffa450edef68
2000-10-02 22:52:20 +00:00
William A. Rowe Jr
796d2a4d39 _not_ up to 100%, but some structural changes to make the rest easier.
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86366 13f79535-47bb-0310-9956-ffa450edef68
2000-10-02 22:29:18 +00:00
William A. Rowe Jr
0a4019faea Just Typos.
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86361 13f79535-47bb-0310-9956-ffa450edef68
2000-10-02 15:49:41 +00:00
William A. Rowe Jr
e7cb8a652d Forward port 1.3 overhaul of isapi to 2.0.
Yes - it's blatently obvious that this should be 'bucketized', but the
  sequence I will follow is:

    *) compatibility of sources
    *) extension to async + transmitfile emulated support
    *) localization of ISAPI* directives to Directory, File blocks
    *) addition of ISAPI caching
    *) recode for buckets.

  I'm actually looking forward to the mod_cgi bucketization as a model.

PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86360 13f79535-47bb-0310-9956-ffa450edef68
2000-10-02 15:38:59 +00:00
William A. Rowe Jr
0e60f79d1c Get mod_auth_dbm building using Apache's sdbmlib under WinNT.
Bad conditional... need a better test to determine if we are using sdbm.

  Also - consistify linkage for expat-lite/sdmb to the same model as all
  the modules (no more nasty "conflicting linkage, use /nodefaultlib" msg.)

PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86257 13f79535-47bb-0310-9956-ffa450edef68
2000-09-20 04:54:06 +00:00
Jeff Trawick
07789920fc Get mod_isapi.c to compile with the level of Win32 headers which
ship with VC++ 5.0.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86200 13f79535-47bb-0310-9956-ffa450edef68
2000-09-11 19:02:40 +00:00
Bill Stoddard
cba8d8f05c Fix win32 compile break.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86027 13f79535-47bb-0310-9956-ffa450edef68
2000-08-08 19:53:27 +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
William A. Rowe Jr
d2c9dd85e3 Another day's progress... little changes, but just establishing the
baseline for fully implementing extensions.  Filters... that's still
  a little way away.  This demonstrates the HSE_STATUS_PENDING result
  wait event trap, so we let another thread keep working till we get
  the HSE_REQ_DONE_WITH_SESSION request.  Cleaned up callback names
  and tossed bunches of stuff in the isapi_cid (connection/request) and
  the isapi_loaded (dll details) for future caching optimizations.


PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85903 13f79535-47bb-0310-9956-ffa450edef68
2000-07-27 05:23:17 +00:00
William A. Rowe Jr
c50d07027c Undo the damage to mod_isapi (leave placeholders for new functions though)
and add APR_EOL_STR to log files (precomiled, of course :)

PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85881 13f79535-47bb-0310-9956-ffa450edef68
2000-07-25 03:26:31 +00:00
William A. Rowe Jr
fc3580dd3b Missing apr_strings.h - hope this wasn't destined for some global header.
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85877 13f79535-47bb-0310-9956-ffa450edef68
2000-07-25 00:58:22 +00:00
Keith Wannamaker
86ef0b09b5 Correct Win32 Expat build.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85818 13f79535-47bb-0310-9956-ffa450edef68
2000-07-11 11:59:34 +00:00
Greg Stein
1f2ceda686 enable Expat for the Win32 build.
Submitted by: Keith Wannamaker


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85749 13f79535-47bb-0310-9956-ffa450edef68
2000-07-03 08:26:52 +00:00
Greg Stein
02a2200fd8 blast the old names for the status codes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85686 13f79535-47bb-0310-9956-ffa450edef68
2000-06-24 17:34:11 +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
Bill Stoddard
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
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
Allan K. Edwards
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
William A. Rowe Jr
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
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
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
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