1
0
mirror of https://github.com/apache/httpd.git synced 2025-11-06 16:49:32 +03:00
Commit Graph

94 Commits

Author SHA1 Message Date
Ryan Bloom
9149dd6fe1 First pass at cleaning up htpasswd. This removes the tmpnam call in
favor of apr_file_mktemp.  This also APR-izes most of the code.  The
file access code is still not using APR, but that will be fixed next.

I also re-organized some of the code to make it a little cleaner, and
to use functions where I could.

PR:	7764


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95712 13f79535-47bb-0310-9956-ffa450edef68
2002-06-16 15:14:41 +00:00
William A. Rowe Jr
89267e317c Prepare for Thom's real patch... this is a detabify only
[passes cvs diff -w with no changes.]

Submitted by:  Thom May <thom@planetarytramp.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95143 13f79535-47bb-0310-9956-ffa450edef68
2002-05-16 19:57:11 +00:00
Jeff Trawick
0f0550b08c avoid colliding with getline() as defined by glibc
(it breaks if you need to turn on _GNU_SOURCE)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95035 13f79535-47bb-0310-9956-ffa450edef68
2002-05-10 18:20:29 +00:00
William A. Rowe Jr
01ba81a1f4 Correct const'ness of argv in all support apps, and use the new
apr_app_initialize over apr_initialize for win32, and other platforms
  that may wish to tweak 'apr-ized' application support (e.g. Netware?)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94633 13f79535-47bb-0310-9956-ffa450edef68
2002-04-13 19:35:18 +00:00
Roy T. Fielding
845cbfd508 Update our copyright for this year.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93918 13f79535-47bb-0310-9956-ffa450edef68
2002-03-13 20:48:07 +00:00
Bradley Nicholes
00053faa90 Updates to allow the utilities to run on NetWare
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92919 13f79535-47bb-0310-9956-ffa450edef68
2002-01-18 23:28:20 +00:00
William A. Rowe Jr
9b3864b084 APR_FINFO_TYPE is all we really needed here.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89642 13f79535-47bb-0310-9956-ffa450edef68
2001-07-20 19:19:39 +00:00
William A. Rowe Jr
1adf783132 A pool is a REQUIRED ARGUMENT, never optional (NULL).
This is why Mladen observed that htpasswd was still broken.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89641 13f79535-47bb-0310-9956-ffa450edef68
2001-07-20 19:13:44 +00:00
David Reid
c200a5ea11 Use a better format type for sizeof. This stops a few compiler
warnings.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88319 13f79535-47bb-0310-9956-ffa450edef68
2001-02-25 15:27:07 +00:00
Roy T. Fielding
381f88d56a Update copyright to 2001
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88184 13f79535-47bb-0310-9956-ffa450edef68
2001-02-16 04:26:53 +00:00
William A. Rowe Jr
ab06ea0b6f Still lots to apr'ize here.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88095 13f79535-47bb-0310-9956-ffa450edef68
2001-02-11 21:00:04 +00:00
Doug MacEachern
88d3406f9a renaming various functions for consistency sake
see: http://apr.apache.org/~dougm/apr_rename.pl
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88019 13f79535-47bb-0310-9956-ffa450edef68
2001-02-08 07:45:33 +00:00
William A. Rowe Jr
cd1ef027c2 The changes required for the APR_FINFO_wanted argument to
apr_stat/lstat/getfileinfo.  These are -NOT- optimal, they
  are simply the required changes to get the server working.
  The size of the patch is a warning about how we need to
  really look at what we are trying to accomplish with all
  of these stat/lstat calls.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87760 13f79535-47bb-0310-9956-ffa450edef68
2001-01-20 21:42:23 +00:00
William A. Rowe Jr
59bbd68bec The big change. This is part 3 of the apr-util symbols rename, please
see the first commit of srclib/apr-util/include (cvs apr-util/include)
  for the quick glance at symbols changed.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87731 13f79535-47bb-0310-9956-ffa450edef68
2001-01-19 07:04:36 +00:00
Ryan Bloom
00ec6af4a5 Cleanups so that the support programs build cleanly. The Win32 values
need to be sanity checked.
Submitted by:	Cliff Woolley <cliffwoolley@yahoo.com>
Reviewed by:	Ryan Bloom


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87506 13f79535-47bb-0310-9956-ffa450edef68
2000-12-22 00:02:52 +00:00
William A. Rowe Jr
c2239e78bd All the supports now build on APR (+APRUTIL), no reliance on httpd.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87501 13f79535-47bb-0310-9956-ffa450edef68
2000-12-21 21:00:45 +00:00
William A. Rowe Jr
a459c026e1 This should build entirely with apr/aprutil support
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87499 13f79535-47bb-0310-9956-ffa450edef68
2000-12-21 20:32:33 +00:00
Jeff Trawick
351725e726 Switch to the APR-provided APR_CHARSET_EBCDIC feature test macro.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87460 13f79535-47bb-0310-9956-ffa450edef68
2000-12-20 16:44:01 +00:00
Ryan Bloom
b5440c348a Force all Apache functions to be linked into the executable, whether they
are used or not.  This uses the same mechanism that is used for APR
and APR-util.  This may not be the correct solution, but it works, and that
is what I really care about.  This also renames CHARSET_EBCDIC to
AP_CHARSET_EBCDIC.  This is for namespace correctness, but it also makes
the exports script a bit easier.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87424 13f79535-47bb-0310-9956-ffa450edef68
2000-12-19 17:05:48 +00:00
Jeff Trawick
5296cf7332 Get htpasswd.c to build on EBCDIC machines again.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87141 13f79535-47bb-0310-9956-ffa450edef68
2000-11-30 19:12:36 +00:00
Greg Stein
ead2dae94c *) Compensate for recent changes in the APR headers. Specifically, some
files need to specifically include stdio.h, or a particular apr_*.h
   header.

*) Adjust callers of apr_create_process() to deal with the extra "const"

*) Add "const" to args of ap_os_create_privileged_process()


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87080 13f79535-47bb-0310-9956-ffa450edef68
2000-11-26 04:47:43 +00:00
William A. Rowe Jr
a37d06254f Fix compile break in Win32
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86611 13f79535-47bb-0310-9956-ffa450edef68
2000-10-16 13:50:40 +00:00
William A. Rowe Jr
7775df3222 Completed review for new tests:
APR_STATUS_IS_EACCES(s)
    APR_STATUS_IS_EEXIST(s)
    APR_STATUS_IS_ENAMETOOLONG(s)
    APR_STATUS_IS_ENOENT(s)

  Where the old EACCES et. al. still exist, we have a problem (not yet
  using APR at all)

  More to come...


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86417 13f79535-47bb-0310-9956-ffa450edef68
2000-10-06 17:52:46 +00:00
Jeff Trawick
99cf606197 Fix some problems with the apr conversion so that APACHE_XLATE builds work
again.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86018 13f79535-47bb-0310-9956-ffa450edef68
2000-08-07 19:26:02 +00:00
Doug MacEachern
059d8dd212 prefix libapr functions and types with apr_
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85976 13f79535-47bb-0310-9956-ffa450edef68
2000-08-02 05:27:38 +00:00
Ryan Bloom
22d9fbdec0 Move all APR functions related to strings to their own directory, and
create a new header for those functions.  This is the first step to
removing the apr/lib directory completely, and moving those files/functions
to descriptive directories.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85867 13f79535-47bb-0310-9956-ffa450edef68
2000-07-21 19:50:58 +00:00
Jeff Trawick
b5c0ae056b 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


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85723 13f79535-47bb-0310-9956-ffa450edef68
2000-06-28 14:33:48 +00:00
Bill Stoddard
944823a2f6 Fix another compiler warning. Forgot to commit this one along with the
earlier patch. Sorry...
Submitted by: Victor Orlikowski
Reviewed by:  Bill Stoddard


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85713 13f79535-47bb-0310-9956-ffa450edef68
2000-06-27 22:39:13 +00:00
Ryan Bloom
16748b4e22 Remove the final vestiges of stat.h from Apache 2.0. All calls are now to
ap_stat.  This also adds the new function ap_lstat().  This function is
analogous to lstat.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85535 13f79535-47bb-0310-9956-ffa450edef68
2000-06-12 15:29:09 +00:00
Ken Coar
c7159757ec Add '-n' option to make htpasswd send user:pw result to
stdout instead of fiddling with a text file.

Reviewed by:	Greg Stein


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85294 13f79535-47bb-0310-9956-ffa450edef68
2000-05-25 16:45:53 +00:00
Jeff Trawick
12eba90506 APR-ize the CHARSET_EBCDIC support in the SHA1 routines. The app (e.g.,
Apache, htpasswd) must call a function to set up translation.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85231 13f79535-47bb-0310-9956-ffa450edef68
2000-05-16 19:48:08 +00:00
Jeff Trawick
12394ec1d5 EBCDIC bug fix: do the required translation handle initialization
so that ap_MD5Encode() can translate properly


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85227 13f79535-47bb-0310-9956-ffa450edef68
2000-05-16 03:59:15 +00:00
Roy T. Fielding
66c90f61ef Get rid of warning by including crypt.h when available.
Make tmpnam stuff less complex.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85134 13f79535-47bb-0310-9956-ffa450edef68
2000-05-04 00:46:51 +00:00
Ken Coar
597b2a381b Use our own buffer for tmpnam() if the platform seems to know
about it.  Avoids threading and reentrancy problems.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85132 13f79535-47bb-0310-9956-ffa450edef68
2000-05-03 17:55:38 +00:00
Ken Coar
9452b0d2a6 Be more expliciti in our error messages if the tmpnam() call fails,
or we have trouble opening the filename it returns.

PR:		Not a solution, but will help debug several


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85129 13f79535-47bb-0310-9956-ffa450edef68
2000-05-03 10:32:45 +00:00
William A. Rowe Jr
716eb6da71 PR:
Obtained from:
Submitted by:
Reviewed by:

  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.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85099 13f79535-47bb-0310-9956-ffa450edef68
2000-04-29 16:23:46 +00:00
Bill Stoddard
6b3fd8e36c Some Windows tweaks from William Rowe...
Submitted by:	William Rowe


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85034 13f79535-47bb-0310-9956-ffa450edef68
2000-04-25 21:18:04 +00:00
Bill Stoddard
befe0a03f6 Include apr_md5.h rather than the deprecated ap_md5.h. Fixes compile break.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85026 13f79535-47bb-0310-9956-ffa450edef68
2000-04-24 14:14:02 +00:00
Roy T. Fielding
e63f4def85 Update to Apache Software License version 1.1
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84881 13f79535-47bb-0310-9956-ffa450edef68
2000-03-31 09:42:55 +00:00
Bill Stoddard
28c41a0ee0 Get htpasswd compiling under Windows
Submitted by:	William Rowe
Reviewed by:	Bill Stoddard


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84826 13f79535-47bb-0310-9956-ffa450edef68
2000-03-22 15:21:57 +00:00
Ryan Bloom
b1c26f031a Fix all the License issues. Including:
s/Apache Group/Apache Software Foundation/
s/1999/2000/
s/Sascha's license/ASF license


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84725 13f79535-47bb-0310-9956-ffa450edef68
2000-03-10 00:07:37 +00:00
Ryan Bloom
482dcf3495 Add a status value to ap_log_error and ap_log_rerror. This allows us to use
apr_status codes in our error logs.  The main advantage of this, is portable
error codes.  Now, Windows will finally be able to use errno!


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84007 13f79535-47bb-0310-9956-ffa450edef68
1999-10-20 12:50:12 +00:00
Ralf S. Engelschall
f5605139ae Make the support stuff finitely working again.
BTW, how can it be that nowadays it can happen that the Apache Group has a
source tree which doesn't compile under Unix for more than two weeks (I was
busy with exams and it didn't compile src/support/ already there)? In the past
this was definitely not possible.  Seems like the source-centered hacker focus
drifts away... sorry, for me this seems like a horrifying evolution, friends.
Please let us always make sure that the source at least compiles. I don't want
to say it should also run, but hell, it should at least compile and if not it
should be fixed within a few days...


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83919 13f79535-47bb-0310-9956-ffa450edef68
1999-09-27 07:19:55 +00:00
Roy T. Fielding
6f96ad5227 Apache 1.3.9 baseline for the Apache 2.0 repository.
Obtained from: Apache 1.3.9 (minus unused files), tag APACHE_1_3_9
Submitted by: Apache Group


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83750 13f79535-47bb-0310-9956-ffa450edef68
1999-08-24 06:46:03 +00:00