PR:
Obtained from:
Submitted by:
Reviewed by:

  First checkin of Win32 service control structure merged into the mpm.

  Project files to be updated with this 'experimental' implementation once
  peer review is complete and the module maintainer accepts the patch.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85358 13f79535-47bb-0310-9956-ffa450edef68

This patch covers os/2, unix & win32. Other platforms still need some
adjustment (BeOS, AIX).

Reviewed by:	rbb, gstein


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85357 13f79535-47bb-0310-9956-ffa450edef68

of the translation handle to before we process ErrorDocument
strings.  The previous placement of this logic only handled
the hard-coded response documents.

When ErrorDocument specifies a redirection, we don't get here.
When the error response is headers only, we don't need to set
the handle for content.  Thus, all paths through
ap_send_error_response() should be handled now.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85356 13f79535-47bb-0310-9956-ffa450edef68

PR:
Obtained from:
Submitted by:
Reviewed by:

  Ugh, sorry bout that... reversing out the last dsp6->dsp5 commit.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85355 13f79535-47bb-0310-9956-ffa450edef68

PR:
Obtained from:
Submitted by:
Reviewed by:

  How, precisely, was Apache going to do anything with rewritten args ;-?
  +1 on my personal oh-duh tally for the weekend.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85354 13f79535-47bb-0310-9956-ffa450edef68

Submitted by:	Jon Travis <jtravis@covalent.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85353 13f79535-47bb-0310-9956-ffa450edef68

saferead.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85352 13f79535-47bb-0310-9956-ffa450edef68

ap_set_content_xlate() takes care of that detail.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85351 13f79535-47bb-0310-9956-ffa450edef68

sending the canned response document to the client.  Otherwise, the
client may get garbage depending on the translation in effect.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85350 13f79535-47bb-0310-9956-ffa450edef68

files, so remove the associated status item.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85349 13f79535-47bb-0310-9956-ffa450edef68

files.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85348 13f79535-47bb-0310-9956-ffa450edef68

Ames' mod_mmap_static patch.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85343 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85342 13f79535-47bb-0310-9956-ffa450edef68

bugs, and changed shmem/locking to use apr API. Shared-mem is currently
disabled, however, because of problems with graceful restarts.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85341 13f79535-47bb-0310-9956-ffa450edef68

PR:
Obtained from:
Submitted by:
Reviewed by:

  One last precursor to the common code base for Win32 rewrite_args from
  it's MPM.  Since we need to walk the arg list... why maintain it in
  several places.  This patch adds the AP_SERVER_BASEARGS definition to
  the header, so any mpm (and mod_info, for example) can know what args
  are legitimate, even when they plan to ignore them.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85340 13f79535-47bb-0310-9956-ffa450edef68

PR:
Obtained from:
Submitted by:
Reviewed by:

  Remove any possiblity of having multiple tags to correct as the version
  changes.  Split httpd.h's version into tokens.  Roll these tokens into
  registry.c

  TODO: Remove registry.c from the list of files to touch when rolling


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85338 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85335 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85334 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85333 13f79535-47bb-0310-9956-ffa450edef68

the link to Apache Web server.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85332 13f79535-47bb-0310-9956-ffa450edef68

isn't used (as in 1.3), except that on Unix it is now logged via
ap_log_rerror() instead of by the child having STDERR_FILENO refer
to the error log.
Submitted by:	Greg Ames
Reviewed by:	Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85331 13f79535-47bb-0310-9956-ffa450edef68

PR:
Obtained from:
Submitted by:
Reviewed by:

  Of course the build order changes without ap.dsp... so this should
  finish things off for tonight.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85330 13f79535-47bb-0310-9956-ffa450edef68

PR:
Obtained from:
Submitted by:
Reviewed by:

  Kill the Win32 library project ap.dsp and slide http_main.c from the
  ApacheCore.dsp into Apache.dsp - this is in prepartion of the real
  services update, which will move registry.c and service.c back into
  ApacheCore.dsp, kill both headers and incorporate their symbols into
  the mpm/winnt/winnt.h file.  main_win32.c will die as well, with it's
  few remaining functions moving into the mpm.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85329 13f79535-47bb-0310-9956-ffa450edef68

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

PR:
Obtained from:
Submitted by:
Reviewed by:

  Adjust the support binary build files for the change from AP_STATIC as
  a library to API_STATIC for the ApacheCore project.

  If we adopt AP_EXPORT_bleh for the ApacheCore, these will be flipped.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85327 13f79535-47bb-0310-9956-ffa450edef68

PR:
Obtained from:
Submitted by:
Reviewed by:

  Finally a patch that can't (well, shouldn't :-) break any other platform.

  Open up the symbols defined for http_main.c to move main() from the core
  under Win32 (that's the real main(), not that apache_main() thing).

  Win32 Project file changes will follow in a seperate patch.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85326 13f79535-47bb-0310-9956-ffa450edef68

	Anchor tags aren't permitted to span elements like this.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85324 13f79535-47bb-0310-9956-ffa450edef68

PR:
Obtained from:
Submitted by:
Reviewed by:

  /D(efine) STATIC to suppress warnings since pcreposix is statically
  linked to pcre.  ApacheCore would have to be touched as well, except
  that we don't override pcre_malloc or pcre_free.  If we do so, the
  STATIC symbol is too broad, and aught to be changed in Apache's
  public src/include/pcre.h headers.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85322 13f79535-47bb-0310-9956-ffa450edef68

PR:
Obtained from:
Submitted by:
Reviewed by:

  Document the lack of exports so http_main.c stays that way,
  as suggested by Greg Stein.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85321 13f79535-47bb-0310-9956-ffa450edef68

PR:
Obtained from:
Submitted by:
Reviewed by:

  One reason ap_config.h can be a problem.  Change VERSION->AB_VERSION to
  avoid ap_config.h #undef.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85320 13f79535-47bb-0310-9956-ffa450edef68

PR:
Obtained from:
Submitted by:
Reviewed by:

  Reverse out additional linkage argument from DECLARE_HOOK
  and IMPLEMENT_HOOK macros.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85319 13f79535-47bb-0310-9956-ffa450edef68

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

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85317 13f79535-47bb-0310-9956-ffa450edef68

PR:
Obtained from:
Submitted by:
Reviewed by:

  Cleanup MSVC .dsp build for support/ files.  Give all support/ .dsp's
  the GCD configuration.  The entire Win32 environment now builds, but
  I'm sure that will be fixed soon :-)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85316 13f79535-47bb-0310-9956-ffa450edef68

PR:
Obtained from:
Submitted by:
Reviewed by:

  Prevent the .dsp project files from being touched if they were
  already cleanly converted.  Note that just loading the 6.0 .dsp
  in the 5.0 MSVC environment doesn't toggle the /ZI->/Zi option.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85315 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85314 13f79535-47bb-0310-9956-ffa450edef68

Submitted by:	Greg Ames


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85313 13f79535-47bb-0310-9956-ffa450edef68

PR:
Obtained from:
Submitted by:
Reviewed by:

  Cleaning up.  Note that apache (or https) -D DEFINE is now enabled, the
  shared data is now properly moved to either ap_hooks.c or http_config.c,
  and all should be well with rewrite_args.

  Next stop, no more apache_main entry point.  That's why this file needs
  to be empty of any callbacks or shared data, as it will bind to the core
  but the core won't be looking back into http_main.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85312 13f79535-47bb-0310-9956-ffa450edef68

  Pass the process_rec to the MPM to allow rewriting of the args list.
  Especially necessary under Win32, or other non-unix front ends where
  oddball arguments might be required, but without causing a mess in
  http_main.c.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85311 13f79535-47bb-0310-9956-ffa450edef68

  A really simple change for readability:

    ap_pool_t *g_pHookPool;           becomes ap_global_hook_pool
    int g_bDebugHooks;                becomes ap_debug_module_hooks
    const char *g_szCurrentHookName;  becomes ap_debug_module_name

  Just as a reminder, these are now declared in ap_hooks.c


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85310 13f79535-47bb-0310-9956-ffa450edef68