httpd

Checkout Tools
  • last updated 1 hour ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates

Changeset 85740 is being indexed.

autoconf gives us WORDS_BIGENDIAN. a bit more of our magic for whether we

even know the byte order one way or another.

    • -1
    • +8
    /httpd/trunk/srclib/expat-lite/xmldef.h
brand new Makefile.in to work in the Apache 2.0 config/build system

bring up to date with respect to Apache 1.3 src/lib/expat-lite/

    • -3
    • +3
    /httpd/trunk/srclib/expat-lite/xmltok.c
    • -12
    • +36
    /httpd/trunk/srclib/expat-lite/CHANGES
    • -0
    • +7
    /httpd/trunk/srclib/expat-lite/xmldef.h
    • -13
    • +13
    /httpd/trunk/srclib/expat-lite/xmltok_impl.c
    • -21
    • +20
    /httpd/trunk/srclib/expat-lite/xmlparse.c
Remove iol_socket.c from OS/2 build after Ryans's cleanup.

Remove ap_get_server_conf() from the MPM's that implement. The only place

this function was ever called was inside the MPM's, and not all of the

MPM's actually had the function. This is part of another round of common

code clean-up.

    • -6
    • +1
    /httpd/trunk/server/mpm/dexter/dexter.c
    • -6
    • +1
    /httpd/trunk/server/mpm/mpmt_beos/mpmt_beos.c
Cast a vote

A good catch, this one was hurting PHP4, possibly others.

PR: 6260

Submitted by: Jerone Janssen <jeroen@darius.demon.nl>

Reviewed by:

    • -0
    • +5
    /httpd/branches/1.3.x/src/os/win32/readdir.h
Fix the problem with ./buildconf not working right out of CVS. The

general problem, is that we were using AC_CONFIG_AUX_DIR_DEFAULT, which

the autoconf source says shouldn't be called directly. It should be

called using AC_REQUIRE, but I couldn't make that work. So, since we know

exactly where the files that we are looking for are located, we'll just

point autoconf directly to them, and ignore all of the hoops. :-)

I am not convinced the AC_CONFIG_AUX_DIR(.) call that I am using is

strictly necessary, but it doesn't cause any problems and it logically

makes sense.

Combine some common code. Before this, all platforms implemented their

own iol_sockets using APR. This just combines all of that code to a

common file and moves that file to main. I have tested this with all of

the Unix MPM's, but I am willing to bet I missed something (Makefiles) for

Windows, and possibly moving some code for OS/2 and BeOS.

    • -1
    • +1
    /httpd/trunk/server/mpm/mpmt_beos/mpmt_beos.c
    • -1
    • +1
    /httpd/trunk/modules/proxy/proxy_http.c
    • -3
    • +3
    /httpd/trunk/modules/proxy/proxy_ftp.c
    • -1
    • +1
    /httpd/trunk/server/mpm/dexter/dexter.c
    • -1
    • +1
    /httpd/trunk/server/mpm/prefork/prefork.c
    • -1
    • +1
    /httpd/trunk/server/mpm/spmt_os2/spmt_os2.c
    • -1
    • +1
    /httpd/trunk/server/mpm/winnt/mpm_winnt.c
RFC 2617 consistently uses "Basic" in the examples, so there is a chance

that some server-side stuff does not recognize "basic" in the Authorization

header. PHP was unfortunately a victim here. This has been fixed in PHP,

but we might as well make ab play nice.

    • -4
    • +4
    /httpd/branches/1.3.x/src/support/ab.c
I am removing my veto and stepping away from this discussion for at least

two days. This does NOT mean I like the patch at all, it just means I have

no desire to continue with this discussion right now. Because I have no

plans to respond to any more e-mail on the topic currently, I have no right

to veto a patch.

always include limits.h for the INT_MAX value.

Submitted by: Jeff Trawick

    • -1
    • +1
    /httpd/trunk/modules/dav/main/mod_dav.h

Adding food for thought

PR:

Obtained from:

Submitted by:

Reviewed by:

First cut at getting mod_mmap_static function into mod_file_cache. My intent is to

retire mod_mmap_static.

    • -60
    • +170
    /httpd/trunk/modules/cache/mod_file_cache.c
Remove the config stuff from the STATUS file. I believe the configuration

in 2.0 is as clean as it's going to get now. Most of the cruft has been

removed. Any more changes that are needed to make the configure system

work can easily be added within the current configuration framework.

Also, update CHANGES to reflect the recent changes to the config system.

Finish the Configuration cleanup. This basically merges all of the

autoconf scripts that APR provides for other programs into apr_common.m4.

Other programs can then just include that file to get the APR checks that

are required.

Submitted by: Sascha Schumann <sascha@schumann.cx>

Update mod_file_cache to use ap_core_translate. mod_file_cache is essentially identical

to mod_mmap_static now. Time to merge the two together...

    • -120
    • +12
    /httpd/trunk/modules/cache/mod_file_cache.c
Include strings.h for strcasecmp(), strncasecmp(), and bzero().

Include time.h for time().

This removes a bunch of compiler warnings with gcc -Wall on AIX.

Submitted by: Jeff Trawick, Victor Orlikowski

    • -1
    • +1
    /httpd/trunk/server/mpm/dexter/dexter.c
    • -0
    • +3
    /httpd/trunk/modules/generators/mod_cgi.c
    • -0
    • +3
    /httpd/trunk/modules/mappers/mod_alias.c
    • -0
    • +3
    /httpd/trunk/modules/http/http_protocol.c
  1. … 8 more files in changeset.
turn this off for now; the stuff compiles but doesn't link...

    • -1
    • +1
    /httpd/trunk/modules/dav/main/config.m4
note todo items to complete first pass of integration

get the DAV stuff to compile for Apache 2.0. some unpleasantries are in

there, but it *does* compile.

    • -71
    • +44
    /httpd/trunk/modules/dav/main/mod_dav.c
    • -31
    • +31
    /httpd/trunk/modules/dav/main/mod_dav.h
    • -48
    • +80
    /httpd/trunk/modules/dav/fs/repos.c
    • -11
    • +15
    /httpd/trunk/modules/dav/fs/dbm.c
    • -16
    • +22
    /httpd/trunk/modules/dav/fs/lock.c
    • -23
    • +23
    /httpd/trunk/modules/dav/main/util.c
    • -4
    • +4
    /httpd/trunk/modules/dav/main/util_lock.c
initial whack at the config/build stuff.

    • -0
    • +7
    /httpd/trunk/modules/dav/main/config.m4
    • -0
    • +10
    /httpd/trunk/modules/dav/main/.cvsignore
    • -0
    • +5
    /httpd/trunk/modules/dav/fs/config.m4
    • -0
    • +6
    /httpd/trunk/modules/dav/main/Makefile.in
    • -0
    • +10
    /httpd/trunk/modules/dav/fs/.cvsignore
    • -0
    • +5
    /httpd/trunk/modules/dav/fs/Makefile.in
first, obvious step: alter the license/copyright on all mod_dav files.

    • -14
    • +54
    /httpd/trunk/modules/dav/main/mod_dav.h
    • -14
    • +55
    /httpd/trunk/modules/dav/main/mod_dav.c
    • -15
    • +53
    /httpd/trunk/modules/dav/fs/repos.c
    • -16
    • +53
    /httpd/trunk/modules/dav/main/util_lock.c
    • -13
    • +53
    /httpd/trunk/modules/dav/fs/repos.h
    • -14
    • +54
    /httpd/trunk/modules/dav/fs/dbm.c
    • -14
    • +54
    /httpd/trunk/modules/dav/main/props.c
    • -16
    • +53
    /httpd/trunk/modules/dav/fs/lock.c
    • -14
    • +54
    /httpd/trunk/modules/dav/main/util.c
initial checkin of the new Apache DAV code. this is a pristine copy of

mod_dav 1.0.1 (tag "V1_0_1" in the mod_dav CVS repository).

For historical information about these files, see the (old) mod_dav web

site at http://www.webdav.org/mod_dav/. CVS repository information can

be located from those pages.

    • -0
    • +315
    /httpd/trunk/modules/dav/fs/dbm.c
    • -0
    • +1809
    /httpd/trunk/modules/dav/main/mod_dav.h
    • -0
    • +1525
    /httpd/trunk/modules/dav/main/props.c
    • -0
    • +75
    /httpd/trunk/modules/dav/fs/repos.h
    • -0
    • +3313
    /httpd/trunk/modules/dav/main/mod_dav.c
    • -0
    • +2087
    /httpd/trunk/modules/dav/main/util.c
    • -0
    • +764
    /httpd/trunk/modules/dav/main/util_lock.c
    • -0
    • +1486
    /httpd/trunk/modules/dav/fs/lock.c
    • -0
    • +421
    /httpd/trunk/server/util_xml.c
    • -0
    • +2007
    /httpd/trunk/modules/dav/fs/repos.c

Whoops... will be needing this exported rsn for mod_mmap_static. But the

argument to register hook fn takes a __cdecl function, so _NONSTD it is.

PR:

Obtained from:

Submitted by:

Reviewed by:

Hook functions aren't translated (and when they are, they are _NONSTD)...

but you don't need to export a function you will pass by ref to a

register hook function.

PR:

Obtained from:

Submitted by:

Reviewed by:

Fix the configure process. This does a couple of things to allow APR and

Apache to share information.

1) Move the calling of APR after Apache decides which MPM is run, but

before Apache generates the Makefiles and related files. This allows

Apache to setup the threading cache values, while still allowing APR

to generate APRVARS in time for Apache to use it.

2) Setup the cache files correctly for RUN_NOW configured subdirectories.

Fix another compiler warning. Forgot to commit this one along with the

earlier patch. Sorry...

Submitted by: Victor Orlikowski

Reviewed by: Bill Stoddard

Fix compiler warning on AIX

Submitted by: Victor Orlikowski

Reviewed by: Bill Stoddard

Pass the configure args to sub_configure scripts with the RUN_NOW macro.

This allows people to specify --disable-threads on Apache's configure

command line, and APR respects it. This is the first step to fixing a

problem introduced by making Apache call APR's configure script before

making any config decisions.