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

632 Commits

Author SHA1 Message Date
Ben Laurie
d638593d7a Oops. Need OpenSSL in FIPS mode.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/fips-dev@190122 13f79535-47bb-0310-9956-ffa450edef68
2005-06-11 14:16:20 +00:00
Ben Laurie
0db2718513 Add --enable-fips, FIPSify everything.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/fips-dev@190120 13f79535-47bb-0310-9956-ffa450edef68
2005-06-11 14:14:56 +00:00
Paul Querna
75c1bee252 - Use the correct newline in htpasswd, instead of always using \n.
PR: 25090


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@179689 13f79535-47bb-0310-9956-ffa450edef68
2005-06-03 01:11:44 +00:00
Joe Orton
8f9c95cb74 * support/ab.c: Rewrite SSL support so that it works reliably, and
enable it by default when the --enable-ssl is passed to configure.
Adds support for -Z and -f arguments to tweak SSL protocol options.

Submitted by: Masaoki Kobayashi <masaoki techfirm.co.jp>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@170612 13f79535-47bb-0310-9956-ffa450edef68
2005-05-17 15:34:43 +00:00
William A. Rowe Jr
10d2058ea4 One issue I repeatedly have with 3rd party module builds is that
they may choose to build a platform-default library with the usual
  platform-default extension, as part of the compilation process.

  Modules built on HP/UX with the .sl extension, on OSX with .dylib,
  or on OS2 or Win32 with .dll are perfectly legitimate loadable
  modules, but don't pass muster with apxs.

  This patch allows any of the common source library extensions to
  be passed in, but makes .so the explicit target.  The behavior
  already works for .la origin files with an .so target name.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@170383 13f79535-47bb-0310-9956-ffa450edef68
2005-05-16 13:03:35 +00:00
William A. Rowe Jr
1c8f208558 Did not belong in r170253; evalute this patch seperately from
the win32 /Oy- patch.  Will recommit for seperate discussion.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@170380 13f79535-47bb-0310-9956-ffa450edef68
2005-05-16 12:59:34 +00:00
William A. Rowe Jr
20d06d7a06 Reintroduce stack frame construction with /Oy- (removal was implied by /O2).
This makes binaries far easier to debug, during operation and for post-crash
  .dmp analysis.  Do not alter /Gs optimizations per brane.

Reviewed by: stoddard, brane

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@170253 13f79535-47bb-0310-9956-ffa450edef68
2005-05-15 19:11:57 +00:00
Bradley Nicholes
93e638300b Link to the correct socket library depending on which one is selected
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@161791 13f79535-47bb-0310-9956-ffa450edef68
2005-04-18 19:54:33 +00:00
Joe Orton
f59e1aac61 * support/ab.c (open_postfile): Use apr_file_read_full, tidy up error
messages, remove redundant variable.s


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@161485 13f79535-47bb-0310-9956-ffa450edef68
2005-04-15 15:22:50 +00:00
Joe Orton
5ffd6acf6a * support/ab.c (test): Treat POST data as a binary blob not a C
string.

PR: 12981
Submitted by: Matthew H. Gerlach <mgerlach@lightsurf.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@161483 13f79535-47bb-0310-9956-ffa450edef68
2005-04-15 15:20:28 +00:00
Joe Orton
4800ec9ba7 Fix and prevent some segfaults in ab:
* support/ab.c (main): Fail if given concurrency level greater than
number of requests, to prevent segfaults later.
(ssl_print_cert_info): Use the correct buffer size.
(ssl_start_connect): SSL_get_peer_cert_chain doesn't bump refcounts,
so don't free the cert chain here.
(test): Use both calloc parameters (unrelated cleanup).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@161437 13f79535-47bb-0310-9956-ffa450edef68
2005-04-15 10:51:44 +00:00
Bradley Nicholes
6905d3d9d5 Allow httpd on NetWare to build using either the standard socket libraries or the Winsock libraries.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@161368 13f79535-47bb-0310-9956-ffa450edef68
2005-04-14 23:42:21 +00:00
Joshua Slive
fa4e866600 Merged the simple-conf branch changes r159781:160695 into the trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@160696 13f79535-47bb-0310-9956-ffa450edef68
2005-04-09 16:59:15 +00:00
William A. Rowe Jr
56406010b6 httpd and Apache are both anticipated now.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@159627 13f79535-47bb-0310-9956-ffa450edef68
2005-03-31 19:05:11 +00:00
Joe Orton
1f76f2acee * support/htdigest.c (main): Fix permissions of created files.
PR: 33765


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@155681 13f79535-47bb-0310-9956-ffa450edef68
2005-02-28 14:28:08 +00:00
Justin Erenkrantz
905cdf9f0b Update copyright year to 2005 and standardize on current copyright owner line.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@151408 13f79535-47bb-0310-9956-ffa450edef68
2005-02-04 20:28:49 +00:00
Justin Erenkrantz
1731589f3c * support/check_forensic: Fix script on platforms that do not have either
mktemp or tempfile (such as Solaris).

Also tested on Darwin & FreeBSD.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@126224 13f79535-47bb-0310-9956-ffa450edef68
2005-01-23 17:36:32 +00:00
Joe Orton
8587927a4f * support/suexec.c (safe_env_lst): Declare array as static const.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@125784 13f79535-47bb-0310-9956-ffa450edef68
2005-01-20 15:38:05 +00:00
Thom May
a804be4099 support/check_forensic: Fix temp file usage
Submitted By: Javier Fernandez-Sanguino Pen~a
Reviewed By: Thom May


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@125495 13f79535-47bb-0310-9956-ffa450edef68
2005-01-18 12:27:12 +00:00
Roy T. Fielding
1db8f31359 Update copyright notice to new format to show what needs
to be done for all of trunk.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@123918 13f79535-47bb-0310-9956-ffa450edef68
2005-01-03 00:38:24 +00:00
William A. Rowe Jr
20e5f62e27 Relative paths were wrong, for the recent ap_release.h patch.
Correct to resolve to httpd-src-root/include.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@123885 13f79535-47bb-0310-9956-ffa450edef68
2005-01-02 08:07:41 +00:00
Jim Jagielski
bfb4758bf3 avoid vim autoindent :)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@111520 13f79535-47bb-0310-9956-ffa450edef68
2004-12-10 16:49:16 +00:00
Jim Jagielski
07e0b89c3b Dangerous assumption, especially if apr_dir_read uses readdir_r.
Be safe.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@111516 13f79535-47bb-0310-9956-ffa450edef68
2004-12-10 15:54:17 +00:00
Bradley Nicholes
4433699079 Allow APR-UTIL to exist and build outside of the httpd/srclib file structure
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@109566 13f79535-47bb-0310-9956-ffa450edef68
2004-12-02 22:00:05 +00:00
Bradley Nicholes
804ff9ab22 Allow APR to exist and build outside of the httpd/srclib file structure
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106975 13f79535-47bb-0310-9956-ffa450edef68
2004-11-30 00:12:39 +00:00
Bradley Nicholes
410501a7c8 Add htcacheclean to the NetWare build.
Submitted by:normw bocnet.com.au

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106746 13f79535-47bb-0310-9956-ffa450edef68
2004-11-27 19:42:32 +00:00
William A. Rowe Jr
b6bbf9791a Eliminate awk autogeneration of the ApacheMonitor's .rc resource
source file.

  By adding several macros to ap_release.h:

    - the stringize magic, in leiu of including a ton of cruft,
    - split subversion and "-dev" tokens (with a binary flag)
    - a _CSV token in the form of m,n,p (not a string)

  we are able to have use a static ApacheMonitor.rc file, which picks
  up all of the necessary values right from ap_release.h.

  If the group likes this approach, I will percolate it throughout
  the project, and we will lose the requirement of awk for everything
  -except- rewriting the installed httpd.conf script (developer builds
  always get an installed httpd.conf script - it's only 'fixed up' 
  with the correct @@ substitutions if they have awk.)

  This project was chosen because ApacheMonitor.rc already exists in svn.

  Comment please.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106313 13f79535-47bb-0310-9956-ffa450edef68
2004-11-23 16:57:18 +00:00
Joe Orton
98176c0621 * support/: Remove generated files which seem to have been resurrected
during the conversion.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105799 13f79535-47bb-0310-9956-ffa450edef68
2004-11-19 09:20:36 +00:00
Joe Orton
c36ecfa64f Remove the .cvsignore files.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105796 13f79535-47bb-0310-9956-ffa450edef68
2004-11-19 09:07:29 +00:00
André Malo
c807bcffe9 use a smarter way to specify the limit
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105710 13f79535-47bb-0310-9956-ffa450edef68
2004-11-06 22:41:54 +00:00
André Malo
ac60309d4b more native newlines
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105709 13f79535-47bb-0310-9956-ffa450edef68
2004-11-06 21:49:31 +00:00
André Malo
7ef8799611 better readability, native newlines, less spam
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105708 13f79535-47bb-0310-9956-ffa450edef68
2004-11-06 21:38:24 +00:00
André Malo
6c3e96a5af another warning.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105707 13f79535-47bb-0310-9956-ffa450edef68
2004-11-06 20:48:13 +00:00
André Malo
f57b382e20 avoid compiler warning
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105706 13f79535-47bb-0310-9956-ffa450edef68
2004-11-06 19:41:55 +00:00
André Malo
311cc11eb9 just style
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105705 13f79535-47bb-0310-9956-ffa450edef68
2004-11-06 19:29:31 +00:00
Justin Erenkrantz
5311975557 Add htcacheclean to function as cleanup utility (daemonizable) for
mod_disk_cache.

(Justin did a whole bunch of style tweaks, and some minor functionality tweaks
to get it to function on Solaris.)

Submitted by:	Andreas Steinmetz
Reviewed by:	Justin Erenkrantz


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105698 13f79535-47bb-0310-9956-ffa450edef68
2004-11-06 07:45:21 +00:00
Allan K. Edwards
4abcf93fc2 WIN64: fix some windows specific 64bit warnings
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105390 13f79535-47bb-0310-9956-ffa450edef68
2004-10-06 13:33:29 +00:00
Joe Orton
bc2d677ed2 * support/apxs.in: Ensure that only a .la target filename is passed on
the libtool link line otherwise libtool tries to link statically.

PR: 31448 (more)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105310 13f79535-47bb-0310-9956-ffa450edef68
2004-09-28 14:30:10 +00:00
Joe Orton
70ed655fa8 * support/apxs.in: Reset $opt so that -I, -D and -Wc,* options are not
passed to the libtool link line.  For "-Wl,-foo" pass "-foo" on the
link line regardless of whether gcc is used; without guessing whether
libtool --mode=link will invoke gcc or some native ld the previous
behaviour is not really correct.

PR: 31448


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105309 13f79535-47bb-0310-9956-ffa450edef68
2004-09-28 13:09:37 +00:00
Jeff Trawick
8eb3fb0802 suexec: Pass the SERVER_SIGNATURE envvar through to CGIs.
Submitted by: Zvi Har'El <rl math.technion.ac.il>
Reviewed by:  Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104703 13f79535-47bb-0310-9956-ffa450edef68
2004-08-18 11:54:49 +00:00
Jeff Trawick
6b7847181f apachectl: Fix a problem finding envvars if sbindir != bindir.
PR:            30723
Submitted by:  Friedrich Haubensak <hsk imb-jena.de>
Reviewed by:   Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104701 13f79535-47bb-0310-9956-ffa450edef68
2004-08-18 11:21:33 +00:00
André Malo
4ce939e3e6 filepath_info wasn't set by the httpd for over 7 years
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104664 13f79535-47bb-0310-9956-ffa450edef68
2004-08-15 17:19:04 +00:00
Joe Orton
84b6512fc8 * configure.in, acinclude.m4: Substitute AP[RU]_CONFIG with location
of installed ap[ru]-config scripts so third-party modules can use
`apxs -q APR_CONFIG`.

* support/apxs.in: Use new AP[RU]_CONFIG variables; use apr-config
--apr-libtool.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104641 13f79535-47bb-0310-9956-ffa450edef68
2004-08-13 09:38:11 +00:00
Joe Orton
d2e2c4e584 * modules/ssl/ssl_engine_kernel.c (ssl_callback_SSLVerify_CRL),
* server/log.c (ap_log_pid),
* server/mpm/prefork/prefork.c (accept_mutex_on, accept_mutex_off),
* support/htdbm.c (htdbm_list):
Fix some non-literal format strings (warnings from gcc -Wformat-security).

PR: 30585
Submitted by: Ulf Harnhammar (SITIC), Joe Orton


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104548 13f79535-47bb-0310-9956-ffa450edef68
2004-08-11 14:25:30 +00:00
Justin Erenkrantz
252e7ae86c Teach apxs how to find ap{ru}-$AP{RU}_MAJOR_VERSION-config
(httpd-2.1+ will be APR 1.0 or higher which uses this convention.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104443 13f79535-47bb-0310-9956-ffa450edef68
2004-08-02 02:38:16 +00:00
Paul Querna
7dbfadb1b1 Small fix on ab's use of sprintf().
PR: 28204
Submitted by: Erik Weide <erik.weidel mplus-technologies.de>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104217 13f79535-47bb-0310-9956-ffa450edef68
2004-07-10 07:18:50 +00:00
Martin Kraemer
a22426c699 Use standardized names for ISO-8859-1, see http://www.iana.org/assignments/character-sets
(Using the name iso8859-1 may still work, because it is aliased in apr-iconv/ccs/charset.aliases)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104078 13f79535-47bb-0310-9956-ffa450edef68
2004-06-29 13:33:24 +00:00
Ken Coar
4f3d5516c5 make the check for GMT offset occur each time through the loop,
in case a switch between standard and daylight savings time
	occurred.  (correction to previous code courtesy of Uli Zappe.)

PR:		24417
Submitted by:	Uli Zappe <uli ritual.org>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103973 13f79535-47bb-0310-9956-ffa450edef68
2004-06-16 21:27:06 +00:00
Ken Coar
784e460e3d oops; left over from an earlier version
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103945 13f79535-47bb-0310-9956-ffa450edef68
2004-06-14 17:02:54 +00:00
Ken Coar
0979b2042f add "-l" option to indicate interval is based on localtime not gmt
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103921 13f79535-47bb-0310-9956-ffa450edef68
2004-06-11 21:43:58 +00:00