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

74 Commits

Author SHA1 Message Date
Jim Jagielski
427c85bd23 Cleanup effort in prep for GA push:
Trim trailing whitespace... no func change



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1174751 13f79535-47bb-0310-9956-ffa450edef68
2011-09-23 13:39:32 +00:00
Stefan Fritsch
feca55db60 - Introduce concept of context prefix (which is an URL prefix)
and context document root (which is the file system directory that
  this URL prefix is mapped to). This generalization of the document
  root makes it easier for scripts to create self-referential URLs and
  to find their files.
- Expose CONTEXT_DOCUMENT_ROOT and CONTEXT_PREFIX as envvars, in mod_rewrite,
  and in ap_expr.
- Make mod_alias and mod_userdir set the context information.
- Allow to override the document root on a per-request basis. This allows
  mass vhosting modules to set DOCUMENT_ROOT correctly.
- Make mod_vhost_alias set the per-request document root

PR: 26052, 46198, 49705

Remaining tasks:
- Use the context document root & prefix in mod_rewrite to make RewriteBase
  unneccessary in many cases. Do this without breaking compatibility.
- Write docs.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1132494 13f79535-47bb-0310-9956-ffa450edef68
2011-06-05 21:33:12 +00:00
Stefan Fritsch
1c07bd20b7 readability improvements:
rename w -> user, x -> prefix
break some very long lines


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1053349 13f79535-47bb-0310-9956-ffa450edef68
2010-12-28 13:39:04 +00:00
Eric Covener
8270929a33 PR44076: allow "userdir disabled" or "userdir public_html" in global scope to
be merged with lists of enabled users in virtual host context as one would 
expect.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1042090 13f79535-47bb-0310-9956-ffa450edef68
2010-12-04 03:30:40 +00:00
Stefan Fritsch
f0fdf298c3 remove some useless use of strlen()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@982017 13f79535-47bb-0310-9956-ffa450edef68
2010-08-03 19:49:21 +00:00
Stefan Fritsch
ebb62867fb Use the new APLOG_USE_MODULE/AP_DECLARE_MODULE macros everywhere to take
advantage of per-module loglevels


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@951895 13f79535-47bb-0310-9956-ffa450edef68
2010-06-06 16:59:50 +00:00
Brian Havard
60fbe11de1 Bring back OS/2 support.
Reverses r758929 with a little bit of conflict resolution.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@807930 13f79535-47bb-0310-9956-ffa450edef68
2009-08-26 08:56:13 +00:00
Jeff Trawick
ee32468a33 remove OS/2 platform support
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758929 13f79535-47bb-0310-9956-ffa450edef68
2009-03-26 23:47:52 +00:00
Jeff Trawick
2f9b9fdd70 remove BeOS OS support
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758891 13f79535-47bb-0310-9956-ffa450edef68
2009-03-26 22:23:44 +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
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
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
Joe Orton
d4f34c59f7 * modules/mappers/mod_userdir.c (get_suexec_id_doer): Fix allocation
size.

PR: 34588


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@165151 13f79535-47bb-0310-9956-ffa450edef68
2005-04-28 15:19:06 +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
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
Joe Orton
6c2a857f63 * modules/mappers/mod_userdir.c (register_hooks): Move suexec_identity
hook to APR_HOOK_FIRST to ensure it runs before the mod_suexec hook.

PR: 18156
Submitted by: Joshua Slive


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104699 13f79535-47bb-0310-9956-ffa450edef68
2004-08-18 08:21:55 +00:00
André Malo
a688f06b19 fix name of The Apache Software Foundation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102618 13f79535-47bb-0310-9956-ffa450edef68
2004-02-09 20:31:03 +00:00
André Malo
3d75c8c079 fix copyright dates according to the first check in
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102572 13f79535-47bb-0310-9956-ffa450edef68
2004-02-08 12:27:14 +00:00
André Malo
4f02cb1e18 apply Apache License, Version 2.0
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102525 13f79535-47bb-0310-9956-ffa450edef68
2004-02-06 22:58:42 +00:00
André Malo
fb07607180 update license to 2004.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102135 13f79535-47bb-0310-9956-ffa450edef68
2004-01-01 13:26:26 +00:00
Jeff Trawick
aa21671e13 switch to APR 1.0 API (which is still in flux)
because of the changes to the argument lists of apr_mmap_dup and apr_socket_create,
2.1-dev won't build with apr and apr-util's 0.9 branch anymore


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101154 13f79535-47bb-0310-9956-ffa450edef68
2003-09-03 19:27:12 +00:00
André Malo
742af25096 finished that boring job:
update license to 2003.

Happy New Year! ;-))


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98573 13f79535-47bb-0310-9956-ffa450edef68
2003-02-03 17:53:28 +00:00
Ryan Bloom
19b98bc41a Allow the UserDir directive to accept a list of directories.
This matches what Apache 1.3 does.  Also add documentation for
this feature.

PR:	9299
Submitted by:	Jay Ball <jay@veggiespam.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97001 13f79535-47bb-0310-9956-ffa450edef68
2002-09-28 06:10:47 +00:00
Joshua Slive
963d47482b Fix some hook ordering problems. mod_vhost_alias should, perhaps, be HOOK_LAST.
It redefines the document root, so it should only be used if no other mapper wants
the request.  I haven't made that change here; I've simply put explict ordering
to make sure we get

mod_alias -> mod_userdir -> mod_vhost_alias

I can't compile apache at the moment for other reasons, so this is untested,
but it looks right to me.

PR: 8853


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96137 13f79535-47bb-0310-9956-ffa450edef68
2002-07-21 18:06:51 +00:00
Ryan Bloom
1cbda7f330 We must set the MIME-type for .shtml files to text/html if we want them
to be parsed for SSI tags.  Add the config for that to the default
config file so that it is easier to enable .shtml parsing.

PR:	9787
Submitted by:	Dave Dyer <ddyer@real-me.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95693 13f79535-47bb-0310-9956-ffa450edef68
2002-06-15 07:20:59 +00:00
Justin Erenkrantz
0c36081dd3 Fix segfault when x hasn't been initialized and tighten its scope.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95443 13f79535-47bb-0310-9956-ffa450edef68
2002-05-31 16:59:13 +00:00
Ryan Bloom
815a20ca54 Fix http redirecting for UserDir. Before this patch, the directive:
UserDir http://www.foo.com/~*/

The code would ignore the http:// and instead use the user's home directory


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95329 13f79535-47bb-0310-9956-ffa450edef68
2002-05-28 23:14:15 +00:00
Joshua Slive
0cf8e3be48 Reverse the hook ordering for mod_userdir and mod_alias so
that Alias/ScriptAlias will override Userdir.

PR: 8841
Reviewed by:	Justin Erenkrantz


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94985 13f79535-47bb-0310-9956-ffa450edef68
2002-05-07 00:17:11 +00:00
Brian Pane
da008d4724 Short-circuit out of mod_userdir's translation handler faster on
non "/~*" requests


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94855 13f79535-47bb-0310-9956-ffa450edef68
2002-04-29 07:45:43 +00:00
Justin Erenkrantz
924fc33d06 Fix suexec invocations from userdir - the ~ was not being prepended to the
uid per our convention.  Therefore, bad things would happen (like we
wouldn't cd to the right directory).

Add a flag to the ap_unix_identity_t structure to indicate if we are in
a userdir - if so, prefix the ~.

(Modified by Justin, but Colm's patch pointed me in the right direction.)

PR: 7810
Submitted by:	Colm <colmmacc@redbrick.dcu.ie>
Reviewed by:	Justin Erenkrantz


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94791 13f79535-47bb-0310-9956-ffa450edef68
2002-04-25 07:18:40 +00:00
Justin Erenkrantz
c39cfec848 Since UserDir is a raw argument, our config system allows it to be blank.
To save us all the hassle, just flat out reject this silliness.  We could
treat blank as ".", but let the user shoot themselves in the foot
explicitly (and don't give them any ideas on how to do it).

PR: 8472


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94790 13f79535-47bb-0310-9956-ffa450edef68
2002-04-25 06:16:06 +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
44fc00ac6a Need to check if the userdir is absolute before it gets split apart by ap_getword()
Also fixed up the !HAVE_DRIVE_LETTERS case (such as NetWare) where
the volume delimiter ( colon ) is not in an absolute position.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93780 13f79535-47bb-0310-9956-ffa450edef68
2002-03-07 22:36:07 +00:00
William A. Rowe Jr
30d1548be6 Fix a handful of AP_MODULE_DECLARE_DATA exports for .so modules.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92805 13f79535-47bb-0310-9956-ffa450edef68
2002-01-10 09:11:33 +00:00
Bradley Nicholes
21292b7b49 Added NetWare to a Win32 #ifdef
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90956 13f79535-47bb-0310-9956-ffa450edef68
2001-09-07 14:52:00 +00:00
William A. Rowe Jr
973dd5be64 New ap_os_is_path_absolute() semantics
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90569 13f79535-47bb-0310-9956-ffa450edef68
2001-08-23 19:08:46 +00:00
Ryan Bloom
8c6d4ea4f8 Fix a seg fault in mod_userdir.c. We used to use the pw structure
without ever filling it out.

PR:	7271
Submitted by:	Taketo Kabe <kabe@sra-tohoku.co.jp> and Cliff Woolley <cliffwoolley@yahoo.com>]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88279 13f79535-47bb-0310-9956-ffa450edef68
2001-02-22 20:50:03 +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
Greg Stein
5dc34feb12 *) continued header revamping
*) torch some headers (and some libs) from the autoconf stuff


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88061 13f79535-47bb-0310-9956-ffa450edef68
2001-02-10 14:04:21 +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
d038b40a6f Fix the remaining APR_FINFO_NORM occurances. Again, followup is needed
to actually test any field outside the scope of APR_FINFO_MIN.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87935 13f79535-47bb-0310-9956-ffa450edef68
2001-01-31 23:11:05 +00:00
William A. Rowe Jr
0d31b31c2a Moved several CHANGES back to APR where they belonged in the first place,
Adopt apr features for simplifing mod_userdir, and accept the new
  Win32/OS2 exceptions without hiccuping

  Also note a potentially serious flaw - others please review.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87902 13f79535-47bb-0310-9956-ffa450edef68
2001-01-28 23:51:53 +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
William A. Rowe Jr
40655f8641 Provide apr_pool_t arg to register_hooks, since anything they do in that
step -must- be done with a pool that will not outlive the cmd pool, from
  which they may have been dynamically loaded.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87697 13f79535-47bb-0310-9956-ffa450edef68
2001-01-17 15:52:12 +00:00
Ben Laurie
45f620672d Make handlers use hooks.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87604 13f79535-47bb-0310-9956-ffa450edef68
2001-01-07 19:55:59 +00:00
Jeff Trawick
960d7c012f add apr_get_home_directory(), teach mod_userdir to use that
instead of calling getpwnam[_r] directly, back out mod_userdir's
config check for getpwnam_r


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86932 13f79535-47bb-0310-9956-ffa450edef68
2000-11-13 03:18:18 +00:00
Jeff Trawick
b8e4c889b3 Get mod_userdir compiling on FreeBSD when APR_HAS_THREADS.
This doesn't account for the fact that getpwnam() isn't
thread-safe on FreeBSD; it also doesn't account for systems
where getpwnam_r lives outside of libc.

See thread with subject "[?PATCH?] using getpwnam_r in mod_userdir"
in Nov. 2000 new-httpd for some better long-term ideas for how to
handle the problem.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86917 13f79535-47bb-0310-9956-ffa450edef68
2000-11-10 23:52:18 +00:00
Ryan Bloom
cdb6b21c47 Remove the comments that I accidentally left in from testing. Doh!
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86913 13f79535-47bb-0310-9956-ffa450edef68
2000-11-10 18:18:57 +00:00