1
0
mirror of https://github.com/apache/httpd.git synced 2026-10-23 22:49:01 +03:00
Commit Graph

686 Commits

Author SHA1 Message Date
Jeff Trawick
01a2b32113 Allow htcacheclean, httxt2dbm, and fcgistarter to link apr/apr-util
statically like the older support programs.

Submitted by: Eric Covener <covener gmail.com>
Reviewed by:  Jeff Trawick



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@441796 13f79535-47bb-0310-9956-ffa450edef68
2006-09-09 15:26:05 +00:00
William A. Rowe Jr
f4d7f73505 Observed by hunter - fix the cut n paste errors in some .res compilation
steps of the win32 build.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@429038 13f79535-47bb-0310-9956-ffa450edef68
2006-08-05 20:04:40 +00:00
Paul Querna
30a9c973ca Revert r422298, because it introduces GNU Make specific extensions to the Makefile, and should be replaced by doing the work inside configure, instead of the Makefile.in.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@422925 13f79535-47bb-0310-9956-ffa450edef68
2006-07-18 00:11:46 +00:00
Paul Querna
d19490ff9b Makefile.in: Don't try to compile checkgid and fcgistarter on win32 when using the autotools build system.
/support: Update svn:ignore for generated exe files

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@422298 13f79535-47bb-0310-9956-ffa450edef68
2006-07-15 22:05:02 +00:00
Roy T. Fielding
8543206431 update license header text
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@421020 13f79535-47bb-0310-9956-ffa450edef68
2006-07-11 23:04:56 +00:00
Roy T. Fielding
47e590252a update license header text
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@420993 13f79535-47bb-0310-9956-ffa450edef68
2006-07-11 21:18:15 +00:00
Roy T. Fielding
44fa6e0073 update license header text
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@420990 13f79535-47bb-0310-9956-ffa450edef68
2006-07-11 20:55:32 +00:00
Roy T. Fielding
de659cbed0 update license header text
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@420983 13f79535-47bb-0310-9956-ffa450edef68
2006-07-11 20:33:53 +00:00
William A. Rowe Jr
6df9b82d20 Revert Revision 397647
While it solves the studio 2005 (we desire this), it breaks
the studio 6 packaging (we require this).  Discussion on list
of practical solutions.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@419644 13f79535-47bb-0310-9956-ffa450edef68
2006-07-06 18:36:23 +00:00
Colm MacCarthaigh
825c3efbcc A keepalive response need not neccessarily have included any content-length
header, handle this case properly for 304 responses. PR39789



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@413861 13f79535-47bb-0310-9956-ffa450edef68
2006-06-13 10:51:54 +00:00
William A. Rowe Jr
b2820e8da8 This resource /D syntax was pretty horridly imported into VS 2005,
change the quotation to ensure a peaceful transition to sln/vcproj files.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@397647 13f79535-47bb-0310-9956-ffa450edef68
2006-04-27 21:41:29 +00:00
Joe Orton
ea4178c202 Fix gcc warnings:
* support/fcgistarter.c (usage): Fix prototype.
(main): Remove unused variable; pass argv[0] to execl.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@397570 13f79535-47bb-0310-9956-ffa450edef68
2006-04-27 15:34:09 +00:00
William A. Rowe Jr
f65c47bd75 Remove all /machine:I386 references, these are getting in the way
of switching linkers from the x86 (default linker) to x64 or other
  possible target platforms.  (Also, this commit cleans up lingering
  /GX switches from the 'BASE' options that are supposed to be unused).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@397407 13f79535-47bb-0310-9956-ffa450edef68
2006-04-27 05:30:39 +00:00
Colm MacCarthaigh
e58985dcf9 when compiling statistics, only interate accross requests which occured.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@396300 13f79535-47bb-0310-9956-ffa450edef68
2006-04-23 18:04:17 +00:00
Garrett Rooney
149971197e * support/fcgistarter.c
(main): Oops, we need to detach before the fork, otherwise this all
   totally fails to work...


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@396069 13f79535-47bb-0310-9956-ffa450edef68
2006-04-22 03:55:02 +00:00
Garrett Rooney
ca55328af7 Merge the fcgi-proxy-dev branch to trunk, adding a FastCGI back end for
mod_proxy.  This log message is just a summary of the changes, for the
full original log messages see r357431:393955 in branches/fcgi-proxy-dev.

* modules/proxy/mod_proxy_fcgi.c: New file, holds the impementation of
  our new fcgi backend for mod_proxy.

* modules/proxy/fcgi_protocol.h: New file, holds constants and structures
  for the fcgi protocol.

* modules/proxy/mod_proxy_balancer.c
  (proxy_balancer_canon): Set up r->path_info, so the PATH_INFO env
   variable is correctly passed on to balancer workers.

* modules/proxy/config.m4: Build the new mod_proxy_fcgi module.

* support: Add fcgistarter to svn:ignore.

* support/Makefile.in: Build the new fcgistarter program.

* support/fcgistarter.c: New program, a helper for starting fcgi worker
  processes.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@396063 13f79535-47bb-0310-9956-ffa450edef68
2006-04-22 03:44:05 +00:00
William A. Rowe Jr
663687ae8e s|/GX |/EHsc | because they were always synonyms, and Visual Studio
2005 edition complains bitterly and loudly that /GX is deprecated.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@395419 13f79535-47bb-0310-9956-ffa450edef68
2006-04-19 22:51:02 +00:00
William A. Rowe Jr
862d0e231e Remove a host of dependencies upon awk, using the same template for
nearly every .rc compilation (giving the output .res file a different
  name for each component).  Adds AP_SERVER_BASEPROJECT to ap_revision.h
  so we can display the proper name of "Apache HTTP Server" as opposed
  to AP_SERVER_BASEPRODUCT (which is, and should remain, simply "Apache"
  for the server string tokens.)



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@395418 13f79535-47bb-0310-9956-ffa450edef68
2006-04-19 22:47:49 +00:00
Colm MacCarthaigh
ebe24d48c7 Update the last year of copyright.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@395229 13f79535-47bb-0310-9956-ffa450edef68
2006-04-19 12:23:42 +00:00
Colm MacCarthaigh
dd95d7c37c Update the copyright year in all .c, .h and .xml files
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@395228 13f79535-47bb-0310-9956-ffa450edef68
2006-04-19 12:11:27 +00:00
Colm MacCarthaigh
b910664e7e Update the copyright notice to reflect that changes have gone in this year
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@394765 13f79535-47bb-0310-9956-ffa450edef68
2006-04-17 20:09:50 +00:00
Jeff Trawick
7eb56e2786 If we don't have a prototype for crypt() we shouldn't
be calling it.

Casting to the desired pointer return type hides the 
truncation of the return value when sizeof(ptr) > 
sizeof(int) and no prototype was included.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@393365 13f79535-47bb-0310-9956-ffa450edef68
2006-04-12 01:58:08 +00:00
Jeff Trawick
6bc545dd7b The crypt() prototype is in <unistd.h> instead of <crypt.h>
on HP-UX.  We had no prototype for crypt() there.
In 64-bit mode, a crash occurred because the pointer 
returned by crypt() was truncated before we passed
the pointer to apr_cpystrn().


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@393364 13f79535-47bb-0310-9956-ffa450edef68
2006-04-12 01:55:11 +00:00
Jeff Trawick
fb17956642 htdbm: Warn the user when adding a plaintext password on a platform
where it wouldn't work with the server (i.e., anywhere that has
crypt()).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@392944 13f79535-47bb-0310-9956-ffa450edef68
2006-04-10 13:31:14 +00:00
Colm MacCarthaigh
88a511e32e Correct a dumb typo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@390519 13f79535-47bb-0310-9956-ffa450edef68
2006-03-31 22:06:14 +00:00
Colm MacCarthaigh
e804af2c37 * Add siege-like behaviour to ApacheBench; output the results, as they have
accrued so far, when the user interrupts with ctrl-c. As the signal handler 
    is non-reentrant, we don't need volatiles, and the operations all look
    signal-safe.

  * Update the base version, since handling a signal differently is an external
    API change of sorts.

  * set the LastChangedRevision svn property, as ab.c has $Rev $ embedded, so
    it really should be.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@390511 13f79535-47bb-0310-9956-ffa450edef68
2006-03-31 21:54:25 +00:00
Colm MacCarthaigh
d0e08c475f Give users the ability to set the window size for apache bench runs. Useful
for benchmarking largefile downloads.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@390504 13f79535-47bb-0310-9956-ffa450edef68
2006-03-31 21:28:36 +00:00
William A. Rowe Jr
10be84690a Determined that yes; apr_general.h may be included in .rc files,
so eliminate a substitute declaration.

  Correct version and copyright generation, this involves 'long line'
  flavor of the first ASF copyright line;  next step will be no more
  awk generation of .rc files, so there we will use the new macro
  AP_SERVER_COPYRIGHT and defined tokens from this file for versions.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@368395 13f79535-47bb-0310-9956-ffa450edef68
2006-01-12 16:11:01 +00:00
William A. Rowe Jr
66e1bedf58 Quiet warnings of POSIX deprecation in win32 support sources.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@357702 13f79535-47bb-0310-9956-ffa450edef68
2005-12-19 15:05:50 +00:00
Joe Orton
c124e62bc5 * modules/ssl/ssl_scache_dc.c (ssl_scache_dc_retrieve): Fix warning
with OpenSSL 0.9.8a.

* support/ab.c (ssl_print_cb, ssl_print_cert_info): Fix warnings with
OpenSSL 0.9.8a.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@349415 13f79535-47bb-0310-9956-ffa450edef68
2005-11-28 16:16:21 +00:00
Jim Jagielski
b72e610410 No functional change: more indenting/formatting changes due to
tabbing


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@332316 13f79535-47bb-0310-9956-ffa450edef68
2005-11-10 16:03:23 +00:00
Jim Jagielski
5061d9fa92 No functional Change: Removing trailing whitespace. This also
means that "blank" lines consisting of just spaces or
tabs are now really blank lines


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@332306 13f79535-47bb-0310-9956-ffa450edef68
2005-11-10 15:11:44 +00:00
Jim Jagielski
5d2fae4818 No functional change: simple detabbing of indented code.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@332305 13f79535-47bb-0310-9956-ffa450edef68
2005-11-10 15:05:51 +00:00
Colm MacCarthaigh
f8ee6a0da2 Logresolve style and nit fix-ups:
* Remove some redundant whitespace in variable declarations. 
   * Add some whitespace for clarity around an if and a while statement. 
   * Remove redundant and unneccessary casts
   * Use APR_HASH_KEY_STRING



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@328048 13f79535-47bb-0310-9956-ffa450edef68
2005-10-24 12:18:54 +00:00
Colm MacCarthaigh
811b2867ab A complete rewrite of support/logresolve.c:
* Now uses APR
    * Supports IPv6 addresses
    * Slighty less hurtful on memory
    * archaic (but interesting) notes marked as historical
    * Will not perform very well without APR >= 1.3 due to
      lack of buffered file-io.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@327909 13f79535-47bb-0310-9956-ffa450edef68
2005-10-24 01:52:56 +00:00
Joe Orton
99b60bff39 * support/ab.c (test): Increment count of started requests when a
non-blocking connect completes; avoids case where more requests are
made than intended.

PR: 36966


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@314844 13f79535-47bb-0310-9956-ffa450edef68
2005-10-12 11:04:18 +00:00
Colm MacCarthaigh
31bebda15a Add htcachclean to the win32 build.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@290659 13f79535-47bb-0310-9956-ffa450edef68
2005-09-21 08:52:08 +00:00
Ian Holsman
8c1e315d3f Doxygen fixup / cleanup
submited by: Neale Ranns neale ranns.org
reviewed by: Ian Holsman



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@263931 13f79535-47bb-0310-9956-ffa450edef68
2005-08-28 23:03:59 +00:00
Colm MacCarthaigh
42377545e2 Allow htcacheclean to deal in gigabytes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@240297 13f79535-47bb-0310-9956-ffa450edef68
2005-08-26 17:54:18 +00:00
Colm MacCarthaigh
51daa83cd7 Allow apachectl to support "graceful-stop" argument
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@240273 13f79535-47bb-0310-9956-ffa450edef68
2005-08-26 16:12:28 +00:00
André Malo
42bcc6868d fix line endings
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@239616 13f79535-47bb-0310-9956-ffa450edef68
2005-08-24 12:01:38 +00:00
Colm MacCarthaigh
275c89cda8 Add APR_FOPEN_BINARY to the options passed to apr for opening the
cache header files.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@239436 13f79535-47bb-0310-9956-ffa450edef68
2005-08-23 17:03:01 +00:00
Andreas Steinmetz
59a68232cc Split mod_disk_cache.c into mod_disk_cache.c and mod_disk_cache.h
to allow inclusion of mod_disk_cache.h in htcacheclean.c.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@239406 13f79535-47bb-0310-9956-ffa450edef68
2005-08-23 13:35:00 +00:00
Colm MacCarthaigh
68e258c315 add htcacheclean to support/README
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@239382 13f79535-47bb-0310-9956-ffa450edef68
2005-08-23 09:29:23 +00:00
Colm MacCarthaigh
7482daa131 Update htcacheclean defines to match mod_disk_cache.c, Andreas is working on
mod_disk_cache.h, an all-round better solution, but for now just fix the
bug.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@239381 13f79535-47bb-0310-9956-ffa450edef68
2005-08-23 09:25:31 +00:00
Joe Orton
48b1a69890 * support/httxt2dbm.c: Fix some style nits, no functional change.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@233462 13f79535-47bb-0310-9956-ffa450edef68
2005-08-19 10:18:10 +00:00
Joe Orton
1e9e5a69cb * support/htcacheclean.c (directory_empty): Remove unused function.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@232218 13f79535-47bb-0310-9956-ffa450edef68
2005-08-12 06:38:01 +00:00
Justin Erenkrantz
c5db9990f3 Add -t option to htcacheclean to clean out empty directories.
* support/htcacheclean.c: Implement -t option.
* docs/man/htcacheclean.8, docs/manual/programs/htcacheclean.html.en,
  docs/manual/programs/htcacheclean.xml: Document -t option.

Justin did some minor tweaks as he agrees with Andreas and Rudiger that
apr_dir_remove should return an error if the directory isn't empty; hence,
remove the apr_dir_read calls.

Submitted by: Colm MacCarthaigh
Reviewed by:  Justin Erenkrantz, Andreas Steinmetz, Rudiger Pluem


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@231351 13f79535-47bb-0310-9956-ffa450edef68
2005-08-10 23:14:57 +00:00
Joe Orton
0141d72a36 * support/httxt2dbm.c: Include stdlib.h to pick up atexit() prototype.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@219845 13f79535-47bb-0310-9956-ffa450edef68
2005-07-20 06:08:47 +00:00
Bradley Nicholes
f55ad90340 Add the NetWare makefile for the httxt2dbm utility
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@209611 13f79535-47bb-0310-9956-ffa450edef68
2005-07-07 15:35:43 +00:00