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

  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

    the time when ap_destroy_pool() is called. it used to be called too
    soon, which caused a core dump on the second CGI request.

Submitted by: Paul J. Reder <rederpj@raleigh.ibm.com>
Reviewed by: Greg Stein


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

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

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

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

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

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

PR:
Obtained from:
Submitted by:
Reviewed by:

  Whoops... the two converters were to be non-destructive, and should be
  allowed to run multiple times in a row without harm.  This fixes a
  snafu that created multiple #PROP lines when invoked repeatedly.


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

PR:
Obtained from:
Submitted by:
Reviewed by:

  Whoops, though I had already knocked off that nasty chomp() side effect.


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

PR:
Obtained from:
Submitted by:
Reviewed by:

  Take advantage of Bill Stoddard's goof to change this over permanently.

  Conversion is rather one way, for consistency.  We can't really maintain
  a dsp version 5 file from version 6, since version 5 likes to split up
  !MESSAGE lines in odd places.  This should make things more consistent.

  Please execute cvstodsp5.pl from the helpers folder, prior to actually
  using the MSVC 5.0 environment.  When you are ready to diff, update or
  commit changes, use dsp5tocvs.pl from the helpers folder to convert
  them all back.  (Be careful that you have CLOSED the DevStudio workspace
  before you try either command!)


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

STATUS file.  I was going to wait, but Manoj (the person who originally
put it in STATUS) said get rid of it, so away it goes.


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

Provide new function ap_set_content_xlate() to simplify what needs
to be done to set up translation of content.  Use it where appropriate.

With this change, EBCDIC logic was tweaked so that ap_checkconv() does
not overlay a translation handle previously stored (e.g., by a module)
unless it is turning translation off.  Unless ap_checkconv() determines
that translation is inappropriate, it should leave the translation handle
alone.


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

	Add '-n' option to make htpasswd send user:pw result to
	stdout instead of fiddling with a text file.

Reviewed by:	Greg Stein


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

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

on Solaris.


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

seems to work, but only really hammering on it will tell for sure.


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

cgid a standard module.


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

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

Windows was having problems with the original names.


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

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

to the ap_proc_t change.


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

	Note a patch for htpasswd.  A matching patch for 1.3 is also
	pending.  I'll commit in a couple of days if no-one comments.


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