Commits · fb8917e50148cb9da5f11f59aed5ada7b95e170f · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP Apache Httpd

27 May, 2000 12 commits

· fb8917e5

William A. Rowe Jr authored May 27, 2000

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

fb8917e5

· f70594fc

William A. Rowe Jr authored May 27, 2000

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

f70594fc

Add a showstopper for Windows. · f5493bd9

Ryan Bloom authored May 27, 2000


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

f5493bd9

· 3e567a39

William A. Rowe Jr authored May 27, 2000

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

3e567a39

· 6fd37f99

William A. Rowe Jr authored May 27, 2000

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

6fd37f99

Keep the MSVC++-isms out of the Unix flavor of API_EXPORT(). · 8097573c
Jeff Trawick authored May 27, 2000
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85314 13f79535-47bb-0310-9956-ffa450edef68
```
8097573c

Fix broken comment in util_ebcdic.c · 8a5f50c4

Jeff Trawick authored May 27, 2000

Submitted by:	Greg Ames


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

8a5f50c4

· aa768cf2

William A. Rowe Jr authored May 27, 2000

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

aa768cf2

· b5e23b85

William A. Rowe Jr authored May 27, 2000

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

b5e23b85

· 61ce74a3

William A. Rowe Jr authored May 27, 2000

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

61ce74a3

· ac3dc926

William A. Rowe Jr authored May 27, 2000

  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

ac3dc926

fixes some compilation errors (macros, function params, etc). also shifts · a92b2580

Greg Stein authored May 27, 2000

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

a92b2580

26 May, 2000 8 commits

· 528c9919

William A. Rowe Jr authored May 26, 2000

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

528c9919

s/IMPORT/EXPORT/g; typo i assume. · 486335f9

Doug MacEachern authored May 26, 2000


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

486335f9

Add mod_charset_lite for configuring character set translation. · 6b853125
Jeff Trawick authored May 26, 2000
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85304 13f79535-47bb-0310-9956-ffa450edef68
```
6b853125
Finish cleaning up after the API_VAR_EXPORT -> APR_VAR_EXPORT renaming. · de63598c
Ryan Bloom authored May 26, 2000
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85303 13f79535-47bb-0310-9956-ffa450edef68
```
de63598c

· 06c7e216

William A. Rowe Jr authored May 26, 2000

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

06c7e216

· ec89e702

William A. Rowe Jr authored May 26, 2000

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

ec89e702

· 7be278da

William A. Rowe Jr authored May 26, 2000

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

7be278da

· 68c34306

William A. Rowe Jr authored May 26, 2000

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

68c34306

25 May, 2000 3 commits

This item doesn't really work properly, so we are removing it from the · 7f96dceb

Ryan Bloom authored May 25, 2000

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

7f96dceb

APACHE_XLATE, CHARSET_EBCDIC stuff: · 95a2cd9b

Jeff Trawick authored May 25, 2000

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

95a2cd9b

· 127a99ce

Ken Coar authored May 25, 2000

	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

127a99ce

24 May, 2000 6 commits

Win32: Convert ap_proc_t to tranparent type. · 95829aee

Bill Stoddard authored May 24, 2000


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

95829aee

Clear up some int vs. pid_t issues in prefork to keep compiles clean · 5bc24b39

Jeff Trawick authored May 24, 2000

on Solaris.


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

5bc24b39

Implement saferead in Apache 2.0. This has had minimal testing, and it · 477a46bd

Ryan Bloom authored May 24, 2000

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

477a46bd

Allow --enable-cgid and --disable-cgid to work. Basically just make · a10997ec

Ryan Bloom authored May 24, 2000

cgid a standard module.


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

a10997ec

Fix a memory leak with ap_wait_or_timeout. · d5062b59

Ryan Bloom authored May 24, 2000


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

d5062b59

Rename stdin, stdout, stderr from new ap_proc_t to in, out, and err because · 98c9764b

Ryan Bloom authored May 24, 2000

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

98c9764b

23 May, 2000 10 commits

use the correct size for 'ret' · 76178208

Greg Stein authored May 23, 2000


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

76178208

Fix a small bug/warning when compiling with use-maintiner-mode related · 179b122c

Ryan Bloom authored May 23, 2000

to the ap_proc_t change.


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

179b122c

· 1b7f3537

Ken Coar authored May 23, 2000

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

1b7f3537

Port mpmt_pthread and dexter to the new ap_proc_t code. This works · a582a993

Ryan Bloom authored May 23, 2000

just fine for these MPMs and it was easy to make the changes.


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

a582a993

Convert ap_proc_t to a complete type. This lets us access the pid directly. · b2ef3034

Ryan Bloom authored May 23, 2000

Only the prefork MPM has been ported so far, the rest of the Unix MPM's are
coming later today.

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

b2ef3034

Win32: Socket reuse is not enabled yet, so always mark used accept sockets · 8da2c013

Bill Stoddard authored May 23, 2000

as being closed.


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

8da2c013

Win32: Fix compile problems. · 31dab189

Bill Stoddard authored May 23, 2000


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

31dab189

Clean up some pid_t vs. int confusion in mpmt_pthread MPM. This is · 90e73a45

Jeff Trawick authored May 23, 2000

needed to avoid some warnings on Solaris.


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

90e73a45

Clean up some pid_t vs. int confusion in dexter.c. This is · edc928ad

Jeff Trawick authored May 23, 2000

needed to avoid some warnings on Solaris.


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

edc928ad

Turn on buffered I/O in mod_include for reading the input file. · a4f510bb
Brian Havard authored May 23, 2000
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85274 13f79535-47bb-0310-9956-ffa450edef68
```
a4f510bb

22 May, 2000 1 commit

Remove ap_destroy_context from Apache 2.0. With the name change back to · c90bfb73

Ryan Bloom authored May 22, 2000

ap_pool_t, this function doesn't make sense. This also changes all
references to ap_destroy_context back to ap_destroy_pool.

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

c90bfb73