Tony Finch [Fri, 12 May 2000 13:14:48 +0000 (13:14 +0000)]
Update to the media types as of 2000-05-12. I also added the non-clashing
filename extensions for the WAP types, as discussed in the "WAP/WML" thread
starting with Message-ID: <391696E0.4D0D6161@Golux.Com>
Obtained from: ftp://ftp.isi.edu/in-notes/iana/assignments/media-types
Bill Stoddard [Fri, 12 May 2000 00:43:43 +0000 (00:43 +0000)]
Win32: Some cleanup of winnt.c. Retry AcceptEx on failure in preparation for
socket reuse patch. Sometimes the recycled accept socket will not work; need
to handle this case by closing it and obtaining a new one.
Jeff Trawick [Thu, 11 May 2000 21:56:51 +0000 (21:56 +0000)]
src/build/build2.mk: build PCRE's configure script if needed (when you
run buildconf, for example)
src/Makefile.in : re-order libpcreposix.la and libpcre.la to make
OS/390's binder happy (now the libraries are listed
in order of dependencies)
Bill Stoddard [Thu, 11 May 2000 21:17:00 +0000 (21:17 +0000)]
Create new function, ap_lingering_close(), which will explicitly do a lingering close
if USE_SO_LINGER is not defined. Move responsibility for closing connections out
of http_connection.c and into the MPMs.
Tony Finch [Thu, 11 May 2000 20:25:46 +0000 (20:25 +0000)]
Add mod_example to the build system.
I also fixed a few bogosities in mod_example itself, mostly improved
ordering of the code; I also fixed the long-standing numbering mistake
for the order of the request processing stages, and added the hook
registering function to the module record.
Jeff Trawick [Thu, 11 May 2000 02:32:05 +0000 (02:32 +0000)]
EBCDIC: Update util_md5.c routines to use APR-ized ap_MD5*()
routines. As in 1.3, ap_md5digest() has a different function
signature when CHARSET_EBCDIC is defined :(
Jeff Trawick [Tue, 9 May 2000 19:29:57 +0000 (19:29 +0000)]
rfc1413.c fixes:
1) we were retrieving our local port before APR filled it in; wait a
little longer :)
(maybe APR needs to be a little smarter about when/if to call
getsockname()? it could call it when the info is first needed and
not do it at all if never needed)
2) when the server dropped the connection before sending a properly-
delimited response, we entered a hard loop; we weren't reacting to
EOF/FIN properly
pcre lives and dies on the _WIN32 define, rather than WIN32...
Adjusted os/win32/os.h to always declare _WIN32, and fixed up
some goodies. Win32 now serves pages.
Cleanup of Apache build with pcre in Win32.
Plus clean up ab and htdigest to conform to build
of other support executables.
Everything seems to be working again.
First crack at getting Apache to build with pcre in Win32.
Cleans up all the gen_ projects to strip off garbage files,
as well, and follows the same pattern for dftables.
Jeff Trawick [Sat, 6 May 2000 13:41:59 +0000 (13:41 +0000)]
serious bug fix:
htdigest didn't init the first parm to ap_open(), so ap_open()
segfaults thinking it was passed valid storage
build portability:
make most src/lib/apr/test/Makefile.in compatible with OS/390
make (no -o outfile after infile specified)
MD5 translation support:
when APR_HAS_XLATE, low-level routines allow translation handle
to be specified
when CHARSET_EBCDIC, password-specific routines always translate,
but client app must set handle before using
Ryan Bloom [Fri, 5 May 2000 23:17:54 +0000 (23:17 +0000)]
Replace hsregex with PCRE. The PCRE library is always used in 2.0,
regardless of what system we are on. Currently, we are using the POSIX
wrappers that PCRE provides.
Sascha Schumann [Thu, 4 May 2000 20:17:22 +0000 (20:17 +0000)]
Move the generating empty deps stuff into fastgen.sh. The .deps files
are only used by Makefiles which are created by fastgen.sh, so fastgen
is the natural place to create them.
The "portable dirname" regex has been changed to remove any number of
trailing slashes. Just in case. :)
Bill Stoddard [Wed, 3 May 2000 16:28:04 +0000 (16:28 +0000)]
Win32: Fix some bugs in the restart logic. This is still rather adhoc. A more rigorous solution
is to maintain a list of overlapped io structures in the child_main control thread
and use HasOverLappedIoCompleted() to manage the connections and pending io.
We must resort to maintaining a list of pending io (i.e. overlapped structures) should
we ever begin using AcceptEx to receive data. Why? We need to be able to detect when
a connection is received but no data is being sent over that connection. There is a
Win32 function (whose name I forget at the moment) to handle this. Why can't Win32
just timeout the connection using setopt??? It would make life so much easier if AcceptEx
just returned TIMEOUT in this condition rather than requiring the application to
explicitly poll the socket to see if data is available.
Final .dsp changes to produce the lightest weight builds
without precompiled headers or source browse files under
Win32. Enabling these is straightforward, if that's what
the user desires. Also correct minor errors, and reset
some project defaults to their current config.
Significantly shorten the Win32 build and shrink symbol tables
for precompiled headers and debugging by eliminating large chunks
of the windows.h declarations, especially the graphical user
interface declarations.
Also eliminates redundant inclusion of winsock and windows headers.
As the GUI sections can be included by adding the windows.h include
prior to any apr headers, these includes now imply something
completely different.
* Makefile header is now completely dynamic
* Absolute paths everywhere
(fixes Tru64 support)
* Get rid of LTLIBRARY_SHARED_NAME rule in library.mk
(fixes Irix support, untested)
* VPATH does not contain variables anymore
(fixes UnixWare support)
* Remove inclusion of program.mk in support/Makefile.in
(PROGRAM_NAME is empty => breaks Irix and others)
* Call REENTRANCY_FLAGS earlier, so that flags are passed to header checks
(might fix OpenBSD pthread.h-detection, untested)
Sorry I missed one. I -really- believe now that ap.h can now be safely swept
out to the attic, but I will leave for someone in unix to test and confirm.
Jeff Trawick [Fri, 28 Apr 2000 18:25:02 +0000 (18:25 +0000)]
Win32:
install ab.exe
fix dependency in Apache.dsw (ab is dependent on aprlib and ap)
fix ab and htdigest projects so that they find all header files
define ap_signal() in apr.hw - this is o.k. for casual use as with
cmd-line programs
use API_VAR_EXPORT as appropriate in getopt.c
general:
ab doesn't need to declare ap_optarg/ap_optind; fix a warning
htdigest needs to call ap_initialize() to avoid segfault at
startup
Dependency sequences appear to overrule other .dsp project sequences.
Also stripped out some nonsense - dependency loops may have caused
some compiliations to always rebuild.
Following constructive advise of Ralf, and comments of JLW:
Consitify use of $(MAKE) directive, and add $(MAKEOPT) dependent
on make tool used. Clearly just a start twords bcc compatibility,
but hopefully a good one. In the process, we make the build just
a little less noisy.
Also a test to see if Manoj wrangled my cvs update mail list
access to broadcast correctly.
Brian Havard [Fri, 28 Apr 2000 06:15:53 +0000 (06:15 +0000)]
Remove unnecessary rules for .S files which clash with the rules for .s file
(which we probably also don't need) on case insensitive systems like OS/2.
#define str*casecmp as stricmp causes reinterpretation of
str*casecmp function declarations. This creates dozens of
compiler emits. Since there is no need, the HAVE_STRCASECMP
macros wipe out the redeclaration.
This is my second and last hack for the evening...
spent way to much time fighting the windoze cvs/ssh
learning curve! Sorry for the previous nonsense docs of
rev 1.22 - still fighting to use the editor for docs :-)
Jeff Trawick [Fri, 28 Apr 2000 02:35:40 +0000 (02:35 +0000)]
extremely minor cleanup:
apr_file_io.h: fix comment describing APR_OS_DEFAULT
sockets.c: use socklen_t instead of int to avoid compile
warning on systems with unsigned sock len parms
dexter/.cvsignore: ignore .deps, .libs
errorcodes.c: get rid of some unused vars
Ryan Bloom [Fri, 28 Apr 2000 00:02:30 +0000 (00:02 +0000)]
This stops Apache 2.0 from trying to compile the server when we run
make install. We never used to build the server when installing in
the 1.3 tree, so I'm going back to that behavior.
Jeff Trawick [Thu, 27 Apr 2000 20:11:34 +0000 (20:11 +0000)]
Repair ap_poll() on UNIX systems where APR's poll flags
have different values than the system's poll flags (i.e.,
call get_revents() to translate flags before returning to
the caller; otherwise, they are quite meaningless :) ).
Fix ab's usage of the new ap_poll() and repair some APR-ization
breakage (e.g., not setting port prior to ap_connect()).
Uninteresting changes:
Change toascii to to_ascii in ab.c to avoid a conflict with MSVC++'s
toascii() (I enabled the NOT_ASCII logic in ab on Win32 recently to
verify that ap_xlate_X() returned the correct error codes and got
warnings on toascii.
get_revent() was reformatted unintentionally. Sorry.
projects / apache / log