cvs commit: apache-devsite API-dict.html
coar98/04/07 17:35:08 Added: .API-dict.html Log: Okey, here we go - a *very* rough first-draft outline for documenting the Apache Web server API. At this point, it's basically just the list of symbols Ralf identified for hide.h. It needs to have non-API (or at least core-internal) items removed, but I don't have time right now. A framework, though, maybe? Revision ChangesPath 1.1 apache-devsite/API-dict.html Index: API-dict.html === !DOCTYPE HTML PUBLIC -//W3C//DTD HTML 3.2 Final//EN HTML HEAD TITLEApache Web server API Dictionary /TITLE /HEAD !-- Background white, links blue (unvisited), navy (visited), red (active) -- BODY BGCOLOR=#FF TEXT=#00 LINK=#FF VLINK=#80 ALINK=#FF !--#include virtual=header.html -- H1 ALIGN=CENTER Apache Web server API Dictionary /H1 BLOCKQUOTE STRONG This file is very much under construction. You should not take anything you find in it at face value. /STRONG /BLOCKQUOTE H2Functions/H2 DL DTSAMPMD5Final/SAMP /DT DD P definition/description /P /DD DTSAMPMD5Init/SAMP DD P definitions/description /P /DD DTSAMPMD5Update/SAMP /DT DD P definition/description /P /DD DTSAMPadd_cgi_vars/SAMP /DT DD P definition/description /P /DD DTSAMPadd_common_vars/SAMP /DT DD P definition/description /P /DD DTSAMPadd_module/SAMP /DT DD P definition/description /P /DD DTSAMPadd_named_module/SAMP /DT DD P definition/description /P /DD DTSAMPadd_per_dir_conf/SAMP /DT DD P definition/description /P /DD DTSAMPadd_per_url_conf/SAMP /DT DD P definition/description /P /DD DTSAMPallow_options/SAMP /DT DD P definition/description /P /DD DTSAMPallow_overrides/SAMP /DT DD P definition/description /P /DD DTSAMPappend_arrays/SAMP /DT DD P definition/description /P /DD DTSAMParray_cat/SAMP /DT DD P definition/description /P /DD DTSAMPauth_name/SAMP /DT DD P definition/description /P /DD DTSAMPauth_type/SAMP /DT DD P definition/description /P /DD DTSAMPbasic_http_header/SAMP /DT DD P definition/description /P /DD DTSAMPbclose/SAMP /DT DD P definition/description /P /DD DTSAMPbcreate/SAMP /DT DD P definition/description /P /DD DTSAMPbfilbuf/SAMP /DT DD P definition/description /P /DD DTSAMPbfileno/SAMP /DT DD P definition/description /P /DD DTSAMPbflsbuf/SAMP /DT DD P definition/description /P /DD DTSAMPbflush/SAMP /DT DD P definition/description /P /DD DTSAMPbgetopt/SAMP /DT DD P definition/description /P /DD DTSAMPbgets/SAMP /DT DD P definition/description /P /DD DTSAMPbhalfduplex/SAMP /DT DD P definition/description /P /DD DTSAMPblock_alarms/SAMP /DT DD P definition/description /P /DD DTSAMPblookc/SAMP /DT DD P definition/description /P /DD DTSAMPbnonblock/SAMP /DT DD P definition/description /P /DD DTSAMPbonerror/SAMP /DT DD P definition/description /P /DD DTSAMPbpushfd/SAMP /DT DD P definition/description /P /DD DTSAMPbputs/SAMP /DT DD P definition/description /P /DD DTSAMPbread/SAMP /DT DD P definition/description /P /DD DTSAMPbsetflag/SAMP /DT DD P definition/description /P /DD DTSAMPbsetopt/SAMP /DT DD P definition/description /P /DD DTSAMPbskiplf/SAMP /DT DD P definition/description /P /DD DTSAMPbvputs/SAMP /DT DD P definition/description /P /DD DTSAMPbwrite/SAMP /DT DD P definition/description /P /DD DTSAMPbytes_in_free_blocks/SAMP /DT DD P definition/description /P /DD DTSAMPbytes_in_pool/SAMP
cvs commit: apache-devsite API-dict.html
jim 98/04/07 18:18:08 Modified:.API-dict.html Log: Add some already hidden APIs Revision ChangesPath 1.2 +84 -0 apache-devsite/API-dict.html Index: API-dict.html === RCS file: /export/home/cvs/apache-devsite/API-dict.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- API-dict.html 1998/04/08 00:35:08 1.1 +++ API-dict.html 1998/04/08 01:18:02 1.2 @@ -44,6 +44,13 @@ definition/description /P /DD + DTSAMPacquire_mutex/SAMP + /DT + DD +P +definition/description +/P + /DD DTSAMPadd_cgi_vars/SAMP /DT DD @@ -94,6 +101,83 @@ /P /DD DTSAMPallow_overrides/SAMP + /DT + DD +P +definition/description +/P + /DD + DTSAMPap_cpystrn/SAMP + /DT + DD +P +definition/description +/P + /DD + DTSAMPap_escape_quotes/SAMP + /DT + DD +P +definition/description +/P + /DD + DTSAMPap_md5/SAMP + /DT + DD +P +definition/description +/P + /DD + DTSAMPap_md5contextTo64/SAMP + /DT + DD +P +definition/description +/P + /DD + DTSAMPap_md5digest/SAMP + /DT + DD +P +definition/description +/P + /DD + DTSAMPap_snprintf/SAMP + /DT + DD +P +definition/description +/P + /DD + DTSAMPap_vformatter/SAMP + /DT + DD +P +definition/description +/P + /DD + DTSAMPap_vsnprintf/SAMP + /DT + DD +P +definition/description +/P + /DD + DTSAMPapapi_get_server_built/SAMP + /DT + DD +P +definition/description +/P + /DD + DTSAMPapapi_get_server_version/SAMP + /DT + DD +P +definition/description +/P + /DD + DTSAMPaplog_error/SAMP /DT DD P
cvs commit: apache-1.3/src/main http_protocol.c
rse 98/04/07 23:30:48
Modified:src/include http_protocol.h
src/main http_protocol.c
Log:
Change parse_uri back to a core function on Dean and Martins request.
Revision ChangesPath
1.40 +1 -1 apache-1.3/src/include/http_protocol.h
Index: http_protocol.h
===
RCS file: /export/home/cvs/apache-1.3/src/include/http_protocol.h,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- http_protocol.h 1998/04/06 07:26:24 1.39
+++ http_protocol.h 1998/04/08 06:30:46 1.40
@@ -203,6 +203,6 @@
/* This is also useful for putting sub_reqs and internal_redirects together
*/
-API_EXPORT(void) parse_uri(request_rec *r, const char *uri);
+CORE_EXPORT(void) parse_uri(request_rec *r, const char *uri);
#endif /* !APACHE_HTTP_PROTOCOL_H */
1.210 +1 -1 apache-1.3/src/main/http_protocol.c
Index: http_protocol.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/http_protocol.c,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -r1.209 -r1.210
--- http_protocol.c 1998/04/06 07:26:28 1.209
+++ http_protocol.c 1998/04/08 06:30:47 1.210
@@ -575,7 +575,7 @@
* - sets r-uri to request uri (without r-args part)
* - sets r-hostname (if not set already) from request (scheme://host:port)
*/
-API_EXPORT(void) parse_uri(request_rec *r, const char *uri)
+CORE_EXPORT(void) parse_uri(request_rec *r, const char *uri)
{
int status = HTTP_OK;
cvs commit: apache-1.3/src/modules/standard mod_rewrite.c
rse 98/04/07 23:40:25
Modified:.STATUS
src CHANGES
src/modules/standard mod_rewrite.c
Log:
A little fix for the error messages from RewriteBase directive.
Submitted by: Todd Eigenschink [EMAIL PROTECTED]
Reviewed by: Ralf S. Engelschall
Revision ChangesPath
1.276 +1 -0 apache-1.3/STATUS
Index: STATUS
===
RCS file: /export/home/cvs/apache-1.3/STATUS,v
retrieving revision 1.275
retrieving revision 1.276
diff -u -r1.275 -r1.276
--- STATUS1998/04/07 15:15:17 1.275
+++ STATUS1998/04/08 06:40:21 1.276
@@ -155,6 +155,7 @@
* Ralf's add of the query (-q) option to apxs
* Ralf's initial doc and Configuration.tmpl entry for mod_mmap_static
* OS/2 tweak to deal with multiple .exe targets. [Brian Havard]
+* Fixed ordering of argument checks for RewriteBase directive, PR#2045
Available Patches:
1.759 +3 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.758
retrieving revision 1.759
diff -u -r1.758 -r1.759
--- CHANGES 1998/04/06 05:21:40 1.758
+++ CHANGES 1998/04/08 06:40:22 1.759
@@ -1,5 +1,8 @@
Changes with Apache 1.3b6
+ *) Fixed ordering of argument checks for RewriteBase directive.
+ [Todd Eigenschink [EMAIL PROTECTED], PR#2045]
+
*) Change Win32 IS_MODULE to SHARED_MODULE to match Unix' method of
indicating that a module is being compiled for dynamic loading. Also
remove #define IS_MODULE from modules and add SHARED_MODULE define
1.100 +2 -2 apache-1.3/src/modules/standard/mod_rewrite.c
Index: mod_rewrite.c
===
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_rewrite.c,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- mod_rewrite.c 1998/04/01 14:24:35 1.99
+++ mod_rewrite.c 1998/04/08 06:40:24 1.100
@@ -520,10 +520,10 @@
{
if (cmd-path == NULL || dconf == NULL)
return RewriteBase: only valid in per-directory config files;
-if (a1[0] != '/')
-return RewriteBase: argument is not a valid URL;
if (a1[0] == '\0')
return RewriteBase: empty URL not allowed;
+if (a1[0] != '/')
+return RewriteBase: argument is not a valid URL;
dconf-baseurl = a1;
cvs commit: apache-1.3 STATUS
pcs 98/04/08 00:48:44 Modified:.STATUS Log: Vote Revision ChangesPath 1.277 +4 -4 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.276 retrieving revision 1.277 diff -u -r1.276 -r1.277 --- STATUS1998/04/08 06:40:21 1.276 +++ STATUS1998/04/08 07:48:43 1.277 @@ -279,16 +279,16 @@ ap_xxx:+1: Ken, Brian, Ralf, Martin, Paul, Roy, Randy - Public API functions (e.g., palloc) -ap_xxx:+1: Ralf, Roy, Dean, Randy, Martin, Brian -apapi_xxx: +1: Ken, Paul +ap_xxx:+1: Ralf, Roy, Dean, Randy, Martin, Brian, Paul +apapi_xxx: +1: Ken - Private functions which we can't make static (because of cross-object usage) but should be (e.g., new_connection) -ap_xxx:+1: Roy, Dean, Randy, Martin, Brian +ap_xxx:+1: Roy, Dean, Randy, Martin, Brian, Paul -0: Ralf -1: Ken apx_xxx: +1: Ralf -appri_xxx: +1: Paul, Ken +appri_xxx: +1: Ken +0: Ralf - Public API module structure variables (e.g.,
cvs commit: apache-1.3 Makefile.tmpl
rse 98/04/08 02:38:49 Modified:.Makefile.tmpl Log: APACI's make distclean should leave the source tree as it was, i.e. it also has to remove some more stuff src/Configure has created. Revision ChangesPath 1.8 +2 -0 apache-1.3/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache-1.3/Makefile.tmpl,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- Makefile.tmpl 1998/04/01 13:16:38 1.7 +++ Makefile.tmpl 1998/04/08 09:38:49 1.8 @@ -384,6 +384,8 @@ -rm -f $(SRC)/modules/standard/Makefile -rm -f $(SRC)/modules/proxy/Makefile -rm -f $(SRC)/modules/Makefile + -rm -f $(SRC)/modules.c + -rm -f $(SRC)/include/ap_config.h -rm -f $(SRC)/Makefile.config -rm -f $(SRC)/Makefile
cvs commit: apache-1.3 STATUS
coar98/04/08 03:34:05
Modified:.STATUS
Log:
Votes, minor mods, veto removed.
Revision ChangesPath
1.278 +8 -21 apache-1.3/STATUS
Index: STATUS
===
RCS file: /export/home/cvs/apache-1.3/STATUS,v
retrieving revision 1.277
retrieving revision 1.278
diff -u -r1.277 -r1.278
--- STATUS1998/04/08 07:48:43 1.277
+++ STATUS1998/04/08 10:34:04 1.278
@@ -87,6 +87,7 @@
* back out USE_PTHREAD_SERIALIZED_ACCEPT for solaris
* Ken's abstraction of SERVER_{BUILT,VERSION}
* Ken's fix for os/unix/os.h and the new -DHIDE functionality
+ -- needs to be undone when HIDE is backed out
* Ralf's Config File Line Continuation
* Ralf's Reanimation of DBM support for RewriteMap in mod_rewrite PR#1696
* Ralf's fix for the `VirtualHost w/o mod_rewrite' situation. PR#1790
@@ -127,6 +128,7 @@
* Ralf's change to make the shared object compilation command more
portable
* Dean's protect against FD_SETSIZE mismatches
* Ralf's fallback stategy because of HIDE for loading shared object
modules
+ -- does this need to be revisited due to HIDE rollback?
* Martin's fix to allow %2F chars in proxy requests and in the uri query
part
* fix to mark listening sockets for closure in the parent after a SIGHUP
@@ -261,13 +263,11 @@
1.3b6 and thus for the 1.3.x release branch via the
apache-1.3/src/test/rename/rename.cf file as the configuration for the
renaming. The used prefix or prefixes are configureable in the file.
- +1: Roy, Ralf, Jim, Ken
+ +1: Roy, Ralf, Jim
0: Marc
NOTES:
- Marc: this is the wrong time for such a big change
- - Ken: only because collisions won't be addressed any
- other way, apparently - otherwise agrees with Marc
- Ralf: Yes, I personally also would like to keep HIDE, but
now because it's vetoed, it's better to rename the
source instead of just having the
@@ -280,16 +280,13 @@
- Public API functions (e.g., palloc)
ap_xxx:+1: Ralf, Roy, Dean, Randy, Martin, Brian, Paul
-apapi_xxx: +1: Ken
- Private functions which we can't make static (because of
cross-object usage) but should be (e.g., new_connection)
ap_xxx:+1: Roy, Dean, Randy, Martin, Brian, Paul
-0: Ralf
--1: Ken
apx_xxx: +1: Ralf
-appri_xxx: +1: Ken
-+0: Ralf
+appri_xxx: +0: Ralf
- Public API module structure variables (e.g.,
status_module) which are used special in Configure,
@@ -302,16 +299,7 @@
apm_xxx: +0: Ralf
Notes:
- - Ken: I'm vetoing the 'same prefix for everything' proposed
- patch because it means that everything is part of the API, and
- every single change - even to things which aren't supposed
- to be used by modules - will require a bump to MMN. Either
- we do it right, and distinguish by name between what's for
- public consumption and what's not, or we don't do a global
- rename at this point. I feel this distinction is necessary
- because of our 'glass house' (full source availability)
- environment. Saying 'look at the [nonexistent] documentation'
- is a cop-out if we're going to do it right.
+ - Ken: Veto rescinded.
- Ralf: My opinion for my decisions are the following ones:
1. The short ap_ prefix is a good idea because its
@@ -414,8 +402,7 @@
-1:
* What do we call the binary: apache or httpd? Under UNIX
- it's httpd, under Win32 it's apache. Maybe rename it
- to apache-httpd?
+ it's httpd, under Win32 it's apache.
apache-httpd: Ken +1
leave it apache: Brian +1, Ralf +1
@@ -455,7 +442,7 @@
field is r-content_languages. Heck it's not even mentioned in
apache-devsite/mmn.txt when we got content_languages (note the s!).
The proposal is to remove r-content_language:
- Status: Dean +1, Paul +1, Roy +1, Ralf +1
+ Status: Dean +1, Paul +1, Roy +1, Ralf +1, Ken +1
- child_exit() is redundant, it can be implemented via cleanups. It is
not symmetric in the sense that there is no exit API method to go
@@ -465,7 +452,7 @@
remove the child_exit() method and document cleanups as the method of
handling this need.
Status: Dean +1, Rasmus +1, Paul +1, Roy +1, Jim +1,
- Martin +1, Ralf +1
+ Martin +1, Ralf +1, Ken +1
cvs commit: apache-devsite API-dict.html
coar98/04/08 04:20:03 Modified:.API-dict.html Log: Add some more structures to be documented. Revision ChangesPath 1.3 +35 -0 apache-devsite/API-dict.html Index: API-dict.html === RCS file: /export/home/cvs/apache-devsite/API-dict.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- API-dict.html 1998/04/08 01:18:02 1.2 +++ API-dict.html 1998/04/08 11:20:02 1.3 @@ -2441,7 +2441,42 @@ /DL H2Structure Definitions/H2 DL + DTSAMParray_header/SAMP + /DT + DD +P +definition/description +/P + /DD + DTSAMPcommand_rec/SAMP + /DT + DD +P +definition/description +/P + /DD + DTSAMPpool/SAMP + /DT + DD +P +definition/description +/P + /DD DTSAMPrequest_rec/SAMP + /DT + DD +P +definition/description +/P + /DD + DTSAMPserver_rec/SAMP + /DT + DD +P +definition/description +/P + /DD + DTSAMPtable/SAMP /DT DD P
cvs commit: apache-1.3 Makefile.tmpl
rse 98/04/08 04:59:57 Modified:.Makefile.tmpl Log: Make sure the initial data files have correct permissions the hard and complicated but portable way (notice that datadir can be equal prefix!) Revision ChangesPath 1.9 +6 -0 apache-1.3/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache-1.3/Makefile.tmpl,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- Makefile.tmpl 1998/04/08 09:38:49 1.8 +++ Makefile.tmpl 1998/04/08 11:59:56 1.9 @@ -327,8 +327,14 @@ install-docroot: @echo === [docroot: Installing initial DocumentRoot files] -$(CP) -R $(ROOT)/htdocs/* $(datadir)/htdocs/ + -find $(datadir)/htdocs/ -type d -print | xargs chmod a+rx + -find $(datadir)/htdocs/ -type f -print | xargs chmod a+r -$(CP) -R $(ROOT)/icons/* $(datadir)/icons/ + -find $(datadir)/icons/ -type d -print | xargs chmod a+rx + -find $(datadir)/icons/ -type f -print | xargs chmod a+r -$(CP) -R $(ROOT)/cgi-bin/* $(datadir)/cgi-bin/ + -find $(datadir)/cgi-bin/ -type d -print | xargs chmod a+rx + -find $(datadir)/cgi-bin/ -type f -print | xargs chmod a+r @echo === [docroot] ## --
cvs commit: apache-1.3/src CHANGES Configure Makefile.tmpl
rse 98/04/08 09:08:13 Modified:.STATUS Makefile.tmpl src CHANGES Configure Makefile.tmpl Log: Allow correct breaks on errors even for the top-level Makefile. Revision ChangesPath 1.279 +1 -0 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.278 retrieving revision 1.279 diff -u -r1.278 -r1.279 --- STATUS1998/04/08 10:34:04 1.278 +++ STATUS1998/04/08 16:08:09 1.279 @@ -158,6 +158,7 @@ * Ralf's initial doc and Configuration.tmpl entry for mod_mmap_static * OS/2 tweak to deal with multiple .exe targets. [Brian Havard] * Fixed ordering of argument checks for RewriteBase directive, PR#2045 +* Ralf's cleanup of subdir movement to again allow correct breaks on error Available Patches: 1.10 +2 -2 apache-1.3/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache-1.3/Makefile.tmpl,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- Makefile.tmpl 1998/04/08 11:59:56 1.9 +++ Makefile.tmpl 1998/04/08 16:08:10 1.10 @@ -144,7 +144,7 @@ # build the standard stuff build-std: - @cd $(SRC); $(MAKE) $(MFLAGS) all 21 | sed -e 's:^\([=]==[=]\) :\1 $(SRC)/:' + @cd $(SRC); $(MAKE) $(MFLAGS) SDP=$(SRC)/ all # build the additional support stuff build-support: @@ -351,7 +351,7 @@ # clean the standard stuff clean-std: - @cd $(SRC); $(MAKE) $(MFLAGS) clean | sed -e 's:^\([=]==[=]\) :\1 $(SRC)/:' + @cd $(SRC); $(MAKE) $(MFLAGS) SDP=$(SRC)/ clean # clean additional support stuff clean-support: 1.760 +8 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.759 retrieving revision 1.760 diff -u -r1.759 -r1.760 --- CHANGES 1998/04/08 06:40:22 1.759 +++ CHANGES 1998/04/08 16:08:11 1.760 @@ -1,5 +1,13 @@ Changes with Apache 1.3b6 + *) Allow top-level (APACI) Makefile to break on build errors + the same way the src/ subtree Makefiles breaks on them by replacing the + initial APACI sed-subdir-display-kludge with a more clean + variable-passing-solution: variable SDP can optionally hold the subdir + prefix which is consistently used for displaying the subdir movement. + This way even the top-level Makefile can stop correctly on errors as the + user expects. [Ralf S. Engelschall] + *) Fixed ordering of argument checks for RewriteBase directive. [Todd Eigenschink [EMAIL PROTECTED], PR#2045] 1.229 +3 -3 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.228 retrieving revision 1.229 diff -u -r1.228 -r1.229 --- Configure 1998/04/05 21:34:38 1.228 +++ Configure 1998/04/08 16:08:11 1.229 @@ -1389,9 +1389,9 @@ all clean depend :: @for i in \$(MODULES); do \\ - echo === modules/\$\$i; \\ - (cd \$\$i \$(MAKE) \$(MFLAGS_STATIC) CC='\$(CC)' AUX_CFLAGS='\$(CFLAGS)' RANLIB='\$(RANLIB)' \$@) || exit 1; \\ - echo === modules/\$\$i; \\ + echo === \$(SDP)modules/\$\$i; \\ + (cd \$\$i \$(MAKE) \$(MFLAGS_STATIC) SDP='\$(SDP)' CC='\$(CC)' AUX_CFLAGS='\$(CFLAGS)' RANLIB='\$(RANLIB)' \$@) || exit 1; \\ + echo === \$(SDP)modules/\$\$i; \\ done EOF 1.88 +9 -9 apache-1.3/src/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache-1.3/src/Makefile.tmpl,v retrieving revision 1.87 retrieving revision 1.88 diff -u -r1.87 -r1.88 --- Makefile.tmpl 1998/03/26 04:58:37 1.87 +++ Makefile.tmpl 1998/04/08 16:08:12 1.88 @@ -29,24 +29,24 @@ subdirs: @for i in $(SUBDIRS); do \ - echo === $$i; \ - ( cd $$i $(MAKE) $(MFLAGS_STATIC) CC='$(CC)' AUX_CFLAGS='$(CFLAGS)' RANLIB='$(RANLIB)') || exit 1; \ - echo === $$i; \ + echo === $(SDP)$$i; \ + ( cd $$i $(MAKE) $(MFLAGS_STATIC) SDP='$(SDP)' CC='$(CC)' AUX_CFLAGS='$(CFLAGS)' RANLIB='$(RANLIB)') || exit 1; \ + echo === $(SDP)$$i; \ done support: support-dir support-dir: - @echo === support; \ - cd support; $(MAKE) $(MFLAGS_STATIC) CC='$(CC)' AUX_CFLAGS='$(CFLAGS)' RANLIB='$(RANLIB)'; \ - echo === support + @echo === $(SDP)support;
cvs commit: apache-1.3 Makefile.tmpl
rse 98/04/08 09:16:43
Modified:.Makefile.tmpl
Log:
Although both xargs and find -exec are POSIX.2, Marc is right:
find -exec is a little bit better because this is even available under
some really old Unix-derivates
Revision ChangesPath
1.11 +6 -6 apache-1.3/Makefile.tmpl
Index: Makefile.tmpl
===
RCS file: /export/home/cvs/apache-1.3/Makefile.tmpl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Makefile.tmpl 1998/04/08 16:08:10 1.10
+++ Makefile.tmpl 1998/04/08 16:16:42 1.11
@@ -327,14 +327,14 @@
install-docroot:
@echo === [docroot: Installing initial DocumentRoot files]
-$(CP) -R $(ROOT)/htdocs/* $(datadir)/htdocs/
- -find $(datadir)/htdocs/ -type d -print | xargs chmod a+rx
- -find $(datadir)/htdocs/ -type f -print | xargs chmod a+r
+ -find $(datadir)/htdocs/ -type d -exec chmod a+rx {} \;
+ -find $(datadir)/htdocs/ -type f -exec chmod a+r {} \;
-$(CP) -R $(ROOT)/icons/* $(datadir)/icons/
- -find $(datadir)/icons/ -type d -print | xargs chmod a+rx
- -find $(datadir)/icons/ -type f -print | xargs chmod a+r
+ -find $(datadir)/icons/ -type d -exec chmod a+rx {} \;
+ -find $(datadir)/icons/ -type f -exec chmod a+r {} \;
-$(CP) -R $(ROOT)/cgi-bin/* $(datadir)/cgi-bin/
- -find $(datadir)/cgi-bin/ -type d -print | xargs chmod a+rx
- -find $(datadir)/cgi-bin/ -type f -print | xargs chmod a+r
+ -find $(datadir)/cgi-bin/ -type d -exec chmod a+rx {} \;
+ -find $(datadir)/cgi-bin/ -type f -exec chmod a+r {} \;
@echo === [docroot]
## --
cvs commit: apache-1.3 STATUS
jim 98/04/08 09:36:28 Modified:.STATUS Log: Revision ChangesPath 1.280 +1 -1 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.279 retrieving revision 1.280 diff -u -r1.279 -r1.280 --- STATUS1998/04/08 16:08:09 1.279 +++ STATUS1998/04/08 16:36:27 1.280 @@ -264,7 +264,7 @@ 1.3b6 and thus for the 1.3.x release branch via the apache-1.3/src/test/rename/rename.cf file as the configuration for the renaming. The used prefix or prefixes are configureable in the file. - +1: Roy, Ralf, Jim + +1: Roy, Ralf 0: Marc NOTES:
