www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-11-06 16:49:32 +03:00
Code Activity
22,500 Commits 62 Branches 304 Tags
c7f1896fa72eafc46943b51a07b72634fda93ca3
Commit Graph

368 Commits

Author SHA1 Message Date
Cliff Woolley
90c19bdbd1 Error out a bit more nicely if the RewriteMap prg: is not found. We 
can't just apr_stat in the first init round because we haven't run
apr_tokenize_to_argv() yet, and it would be a relatively ugly hack to run
it twice just for that.  Well, I suppose we could store the argv in the
rewritemap structure, but ... nah.  With this, we shutdown (cleanly, as
opposed to the old exit(1) method) if we go to execute a rewritemap
and discover it doesn't exist, and log a nice descriptive message at the
end of the error_log.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95337 13f79535-47bb-0310-9956-ffa450edef68
 2002-05-29 04:38:59 +00:00
Cliff Woolley
70d8c575a4 Fix RewriteMap prg:'s that have command-line args. 
PR: 8464
Submitted by: James Tait <JTait@wyrddreams.demon.co.uk>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95334 13f79535-47bb-0310-9956-ffa450edef68
 2002-05-29 03:27:01 +00:00
Cliff Woolley
95c5d1bfd1 propagate gregames' change to the other callers of that function 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95189 13f79535-47bb-0310-9956-ffa450edef68
 2002-05-20 18:33:41 +00:00
Greg Ames
31e25d29fe don't try to set permissions on the rewrite_log_lock unless it is a SysV 
sem


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95188 13f79535-47bb-0310-9956-ffa450edef68
 2002-05-20 18:13:14 +00:00
Jeff Trawick
50bac91072 stop using APLOG_NOERRNO in calls to ap_log_[pr]error() 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95150 13f79535-47bb-0310-9956-ffa450edef68
 2002-05-17 11:24:17 +00:00
Justin Erenkrantz
d60a704bfe It isn't a fatal condition if there is no lockfile name, so switch from 
APR_EINVAL to APR_SUCCESS.  (rewritelock_remove already returns SUCCESS in
this case.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94981 13f79535-47bb-0310-9956-ffa450edef68
 2002-05-06 22:59:56 +00:00
Aaron Bannert
7713016316 Protect us from this dirty hack that gets SysV Sem working again 
on mod_rewrite. This, along with the original usage of a unix-only
function in mod_rewrite, is a temporary stopgap measure designed only
to workaround limitations in APR's handling of permission attributes.
It shall be removed as soon as that interface is improved.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94972 13f79535-47bb-0310-9956-ffa450edef68
 2002-05-06 21:00:50 +00:00
Aaron Bannert
28ef5dd641 Fix mod_rewrite hang when APR uses SysV Semaphores. Before we were 
silently failing when locking/unlocking the mutex, since httpd
child processes didn't have permissions to access the root-created
semaphore.

PR: 8143


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94969 13f79535-47bb-0310-9956-ffa450edef68
 2002-05-06 18:24:03 +00:00
Aaron Bannert
00d5972391 Add some error checking in mod_rewrite for the mutex lock/unlock calls. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94967 13f79535-47bb-0310-9956-ffa450edef68
 2002-05-06 18:04:53 +00:00
Jeff Trawick
7b4023ab2c fix the type of the pointer returned by the hash lookup 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94961 13f79535-47bb-0310-9956-ffa450edef68
 2002-05-06 14:02:50 +00:00
Cliff Woolley
e80327a02e Added an optional function (ap_register_rewrite_mapfunc) which allows 
third-party modules to extend mod_rewrite's "int:" internal RewriteMap
functionality.

Concept by:  Tahiry Ramanamampanoharana <nomentsoa@hotmail.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94939 13f79535-47bb-0310-9956-ffa450edef68
 2002-05-06 03:10:24 +00:00
Sander Striker
71f960866f Update for APR rename of apr_get_groupname to apr_group_name_get. 
Submitted by: Thom May <thom@planetarytramp.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94752 13f79535-47bb-0310-9956-ffa450edef68
 2002-04-22 10:27:01 +00:00
Sander Striker
6e8efec657 Adapt to the rename of apr_explode_localtime to apr_time_exp_lt in APR. 
Submitted by: Thom May <thom@planetarytramp.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94631 13f79535-47bb-0310-9956-ffa450edef68
 2002-04-13 12:02:38 +00:00
Aaron Bannert
1e8b1a0dbc Update mod_rewrite to use the new APR global mutex type. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94465 13f79535-47bb-0310-9956-ffa450edef68
 2002-04-05 20:01:20 +00:00
Bill Stoddard
d5c24720dc Commit 1 of 2 to: 
1. rename ap_rset_content_type to ap_set_content_type
2. reverse the arguments on the call to aligh with ap_set_content_length


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94056 13f79535-47bb-0310-9956-ffa450edef68
 2002-03-20 17:41:55 +00:00
Bill Stoddard
470edb9dd8 First commit to introduce accessor function to set r->content_type.. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94027 13f79535-47bb-0310-9956-ffa450edef68
 2002-03-20 01:58:47 +00:00
William A. Rowe Jr
65a37752ec Eliminate potential ap_server_root_relative segfaults, with the input 
of Jeff Trawick's style changes to the first patches.  Doesn't include
  the fixes to ssl [more complex], and we won't trap errors that involve
  ap_serverroot, since we presume that was normalized on the way in.
  Therefore, testing ap_server_root_relative(DEFAULT_FOO) cases
  should never become necessary.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93965 13f79535-47bb-0310-9956-ffa450edef68
 2002-03-16 18:26:58 +00:00
Jeff Trawick
2df1a02f72 deal with the rename of kill_after_timeout to APR_KILL_AFTER_TIMEOUT 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93940 13f79535-47bb-0310-9956-ffa450edef68
 2002-03-14 22:19:14 +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
Ian Holsman
da35725071 apr-utils rename apr_ansi_time_to_apr_time and 
apr_exploded_time_t.

PR:
Obtained from:
Submitted by:	Thom May <thom@planetarytramp.net>
Reviewed by:	Ian Holsman


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93733 13f79535-47bb-0310-9956-ffa450edef68
 2002-03-06 17:55:38 +00:00
William A. Rowe Jr
402a038805 Whoh boy that's rough... We sometimes like to answer SIGHUP in the 
parent process, don't we?

  This -was- post-fork() in 1.3, but with the massive restructuring,
  we inadvertantly now whack the parent process.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93587 13f79535-47bb-0310-9956-ffa450edef68
 2002-02-27 03:52:20 +00:00
Brian Pane
365a01fe4e Updated the mapper lock to use apr_global_mutex_t instead 
of apr_proc_mutex_t


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93467 13f79535-47bb-0310-9956-ffa450edef68
 2002-02-18 01:31:56 +00:00
Brian Pane
7ae884c5ee Converted the rewrite mapper lock to the new lock API 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93445 13f79535-47bb-0310-9956-ffa450edef68
 2002-02-16 21:57:17 +00:00
Jeff Trawick
20778bd6f0 const is nice 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93073 13f79535-47bb-0310-9956-ffa450edef68
 2002-01-29 12:30:52 +00:00
Martin Kraemer
82684e7331 No need to use strcpy() where a ptr assignment is ok 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93072 13f79535-47bb-0310-9956-ffa450edef68
 2002-01-29 09:09:47 +00:00
Jeff Trawick
d78de7dc76 Fix a segfault in mod_rewrite's logging code caused by passing the 
wrong config to ap_get_remote_host().


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92827 13f79535-47bb-0310-9956-ffa450edef68
 2002-01-11 13:38:28 +00:00
Bradley Nicholes
3356d10c5b Code updates to allow Mod_Rewrite and Mod_Auth_DBM to build on NetWare 
Submitted by: G�nter Knauf <gk@gknw.de>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92775 13f79535-47bb-0310-9956-ffa450edef68
 2002-01-08 21:16:08 +00:00
Jeff Trawick
57b42f96ac handle the disappearance of apr_lock_create_np() and 
apr_proc_mutex_create_np() and the new parameter to
apr_lock_create() and apr_proc_mutex_create()


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92653 13f79535-47bb-0310-9956-ffa450edef68
 2001-12-29 23:16:24 +00:00
Ian Holsman
86b792b21c Modify post_config hook so that it can return a error, 
causing the server not to start.
previous method was to call exit(1) which would not fail
gracefully

PR:
Obtained from:
Submitted by:
Reviewed by:	(Idea only Jeff Trawick)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92144 13f79535-47bb-0310-9956-ffa450edef68
 2001-11-23 16:35:22 +00:00
Ken Coar
06243788dd Typo fixit 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92033 13f79535-47bb-0310-9956-ffa450edef68
 2001-11-19 15:27:39 +00:00
Aaron Bannert
b77471f71c Convert mod_rewrite's INTRAPROCESS lock to the newly supported 
apr_thread_mutex_t type lock. Passes all rewrite.t tests.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91941 13f79535-47bb-0310-9956-ffa450edef68
 2001-11-14 08:03:18 +00:00
Aaron Bannert
3e59c439e3 Convert tabs to spaces, and a couple other style changes. No functional 
changes. I checked with the rewrite.t perl-framework test to make sure
it still passes.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91940 13f79535-47bb-0310-9956-ffa450edef68
 2001-11-14 07:50:00 +00:00
Ian Holsman
eea38d7c2e This patch changes the apr_table_elts macro so that it provides 
access to the internals of an apr_table_t via a const pointer
instead of the current non-const pointer.


Submitted by:	Brian Pane <BPane@pacbell.net>
Reviewed by:	Ian Holsman


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91860 13f79535-47bb-0310-9956-ffa450edef68
 2001-11-11 22:31:04 +00:00
William A. Rowe Jr
61f021ac41 Reading commit log messages can be very helpful for noting inconsistent 
comments... no code is hurt in this commit


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91623 13f79535-47bb-0310-9956-ffa450edef68
 2001-10-21 17:56:36 +00:00
William A. Rowe Jr
4afd061ef1 The test of filename[0] == '/' is very evil ;) 
More patches required to;

    1. use apr_filepath_merge rather than apr_pstrcat for creating proper
       and canonical paths.

    2. untangle the proxy: fooness that no longer works in directory_walk.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91622 13f79535-47bb-0310-9956-ffa450edef68
 2001-10-21 17:48:21 +00:00
William A. Rowe Jr
9234f5368e Thread saftey lock for mod_rewrite's cache... I'm sure others will have 
some 'better ideas' but this will work for now.

Submitted by: Brian Pane <bpane@pacbell.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91612 13f79535-47bb-0310-9956-ffa450edef68
 2001-10-21 01:24:35 +00:00
Jeff Trawick
c216c2184a fix some homophonic issues in comments, as well as some 
mispelings found near "its" or "it's"

(helping our 4th grader with homework, couldn't help but
grep)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90173 13f79535-47bb-0310-9956-ffa450edef68
 2001-08-15 21:11:59 +00:00
Jeff Trawick
ca28a793ab mod_rewrite: Fix the line ending on some non-Unix systems for 
messages written to the rewrite log.

Submitted by: Richard Labennett <rlabenn@us.ibm.com>
Reviewed by:  Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90001 13f79535-47bb-0310-9956-ffa450edef68
 2001-08-07 19:34:58 +00:00
William A. Rowe Jr
5ccc4eb814 Some cast magic for intentional float/int transformations. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89711 13f79535-47bb-0310-9956-ffa450edef68
 2001-07-25 21:12:45 +00:00
William A. Rowe Jr
1501c81198 Remove last public vestigages of APR_INHERIT 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89600 13f79535-47bb-0310-9956-ffa450edef68
 2001-07-18 19:41:20 +00:00
William A. Rowe Jr
1fa29a8d2d Obvious files that need inheritance, correct me if I'm wrong. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89561 13f79535-47bb-0310-9956-ffa450edef68
 2001-07-16 21:07:40 +00:00
Ken Coar
2b54256b59 Bring forward the NOESCAPE flag from 1.3.. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89158 13f79535-47bb-0310-9956-ffa450edef68
 2001-05-18 18:38:42 +00:00
Chuck Murcko
93463cfc17 This is a fix that went into v1.3 quite a while back, but not into v2.0. 
It sorts out the problem when a password protected reverse proxy URL
sends a Proxy-Authenticate to a browser instead of a WWW-Authenticate.

This patch covers the changes to the httpd-2.0 tree.

Submitted by:	Graham Leggett
Reviewed by:	Chuck Murcko


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88527 13f79535-47bb-0310-9956-ffa450edef68
 2001-03-16 07:28:08 +00:00
Jeff Trawick
d3dcba691d tweak ap_get_remote_host() so that the caller can find out if she got 
back an IP address

mod_access needed to know this, but the old code didn't handle IPv6


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88484 13f79535-47bb-0310-9956-ffa450edef68
 2001-03-09 20:30:34 +00:00
Jeff Trawick
01dd97bd88 Fix some APR-ization issues: 
1) we're using an apr_time_t file mtime, but trying to fit it in
   a time_t entry in the cache and in parameters to the cache
   access routines; use apr_time_t everywhere

2) we need to use apr_fileperms_t instead of mode_t for APR
   file permissions

PR:		6980


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88443 13f79535-47bb-0310-9956-ffa450edef68
 2001-03-03 01:46:16 +00:00
Roy T. Fielding
7b1b30525b Intermediate change of hardcoded "helpers" reference to "build" 
until I get a chance to revamp this to use APR's variables directly.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88230 13f79535-47bb-0310-9956-ffa450edef68
 2001-02-18 16:07:31 +00:00
Greg Stein
dd9b08e321 *) Introduce "ap_conf_vector_t" type to assist with legibility and provide 
some type safety. (unfortunately, our old "void*" is type-safe with the
   new one, but over time we should be better)

*) Propagate the new type to all appropriate functions.

*) Random cleaning, whitespace, stylistic nits.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88225 13f79535-47bb-0310-9956-ffa450edef68
 2001-02-18 02:58:53 +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
Doug MacEachern
ac5b27b86d doh. need a spellchekker for these rename scripts. s/apr_lock_aquire/apr_lock_acquire/g; 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88150 13f79535-47bb-0310-9956-ffa450edef68
 2001-02-13 23:32:28 +00:00
Greg Stein
dc44adee51 include "apr_signal.h" when needed 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88082 13f79535-47bb-0310-9956-ffa450edef68
 2001-02-11 01:09:02 +00:00