Ryan Bloom [Mon, 5 Jun 2000 19:44:02 +0000 (19:44 +0000)]
Add server tokens back to 2.0. Also bring forward the change to allow
the PRODUCT_ONLY value for ServerTokens. This is relatively clean,
all of the code lives in http_core, and when a module wants to add a token,
they just call ap_add_version_component from the post_config hook. Actually
ap_add_version_component can be done anytime after the config has been
parsed, it just makes the most sense to do it in post_config IMHO.
Ryan Bloom [Mon, 5 Jun 2000 16:51:06 +0000 (16:51 +0000)]
Fix mod_so handling. Basically, if --enable-so or
--enable-some-module=shared is specified on the ./configure line, then
mod_so is included in the build, -ldl is added to LIBS, and --enable-dso is
added to APR's configure line. Otherwise, mod_so is turned off, -ldl is
not added, and APR is specifically told to build without DSO support.
Jeff Trawick [Sun, 4 Jun 2000 19:46:22 +0000 (19:46 +0000)]
mod_cgid:
fix parmlist to ap_open() so that we can open the ScriptLog file o.k.
in log_script(), don't do anything with script_err parm if it is NULL
(for mod_cgid, it is always NULL; rather than simply ripping out such
logic I kept it in case somebody wants to factor out common parts of
mod_cgi.c and mod_cgid.c later)
Jeff Trawick [Sun, 4 Jun 2000 19:27:02 +0000 (19:27 +0000)]
mod_charset_lite:
functional changes:
setup input translation for PUT or POST
other:
bail out more quickly if our dir config says do nothing,
tweak the debug trace,
a few changes that should be in the next announcement. I still think this is
waaaay too corporatespeakish and that we should add more information about
how to get involved with development.
And is it true that we're still particularly less stable on Win32?
Ryan Bloom [Sat, 3 Jun 2000 16:27:03 +0000 (16:27 +0000)]
Modify the config order so that we read the config, process all EXEC_ON_READ
directives at the same time, run pre_config hook for all modules, and
then walk the tree. This allows all modules to have a pre_config hook and
know that it will be called at a reasonable time. I also made "Include"
an EXEC_ON_READ directive so that it is included in the tree properly.
This was required after the other changes that were made.
Jeff Trawick [Fri, 2 Jun 2000 15:55:20 +0000 (15:55 +0000)]
APACHE_XLATE, when doing translation that isn't single-byte-only
We must zap the Content-length header (if any). Otherwise, the
browser will be seriously confused :) The header is zapped in
ap_set_keepalive() right before we look for Content-length, transfer
encoding, HTTP level, etc. to decide, among other issues, whether or
not to turn on chunked encoding. For HTTP 1.1, if we don't send
Content-length, we need to use chunked encoding, so we have to zap
the header before that decision.
Interestingly, in Russian Apache the Content-length header is
zapped after ap_set_keepalive() is called, so with HTTP 1.1 they
break the content-length-or-chunked rule.
Ryan Bloom [Thu, 1 Jun 2000 15:45:18 +0000 (15:45 +0000)]
Fix DSO enabling logic. Basically if --enable-dso was specified on the
command line but the cache had DSO off, we used to turn DSO off. This has
been fixed with this patch. Also, if we specify ANY Apache module as
being compiled shared, then we automatically turn on mod_so.
Ryan Bloom [Thu, 1 Jun 2000 01:01:16 +0000 (01:01 +0000)]
Fix building with DSO support. If any module is configured to be
compiled for shared support then APR_HAS_DSO is enabled and -ldl is
added to the LIBS variable. -ldl may need to be modified based on
platform. If no modules are designated as shared then APR_HAS_DSO is
disabled and nothing is added to LIBS. In basic testing this compiled
without errors or warnings.
Brian Havard [Wed, 31 May 2000 02:30:30 +0000 (02:30 +0000)]
Rework DSO error reporting to be more flexible & informative.
This patch covers os/2, unix & win32. Other platforms still need some
adjustment (BeOS, AIX).
Jeff Trawick [Wed, 31 May 2000 01:35:46 +0000 (01:35 +0000)]
APACHE_XLATE: in ap_send_error_response(), move the setting
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.
Jeff Trawick [Tue, 30 May 2000 14:20:46 +0000 (14:20 +0000)]
Ensure that the proper translation handle (if any) is used when
sending the canned response document to the client. Otherwise, the
client may get garbage depending on the translation in effect.
Ronald Tschalar [Mon, 29 May 2000 08:57:18 +0000 (08:57 +0000)]
Brought mod_auth_digest up to synch with 1.3, fixed ap_time_t-related
bugs, and changed shmem/locking to use apr API. Shared-mem is currently
disabled, however, because of problems with graceful restarts.
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.
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
Jeff Trawick [Sun, 28 May 2000 11:48:24 +0000 (11:48 +0000)]
mod_cgi: Restore logging of stderr from child process when ScriptLog
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
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.
/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.
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 :-)
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.
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.
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.
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:
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.
Greg Stein [Sat, 27 May 2000 00:48:49 +0000 (00:48 +0000)]
fixes some compilation errors (macros, function params, etc). also shifts
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
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.
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.
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!)
Ryan Bloom [Thu, 25 May 2000 23:29:59 +0000 (23:29 +0000)]
This item doesn't really work properly, so we are removing it from the
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.
Jeff Trawick [Thu, 25 May 2000 20:51:25 +0000 (20:51 +0000)]
APACHE_XLATE, CHARSET_EBCDIC stuff:
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.
Ryan Bloom [Tue, 23 May 2000 21:04:03 +0000 (21:04 +0000)]
Convert ap_proc_t to a complete type. This lets us access the pid directly.
Only the prefork MPM has been ported so far, the rest of the Unix MPM's are
coming later today.
projects / apache / log