wsanchez 99/05/03 18:07:32
Modified: src CHANGES Configure Log: Fix trivial but thoroughly annoying bug with the test for Configuration.tmpl being newer than Configuration. If both files are created within a minute of each other (eg. when using APACI and shadow trees), ls -lt is unable to resolve the difference and orders them as specified on the command line. For example, on Linux: [calloway:ttypa:/tmp] tritan% touch 1 2 [calloway:ttypa:/tmp] tritan% ls -lt 1 2 -rw-r--r-- 1 tritan mit 0 May 3 20:52 1 -rw-r--r-- 1 tritan mit 0 May 3 20:52 2 [calloway:ttypa:/tmp] tritan% ls -lt 2 1 -rw-r--r-- 1 tritan mit 0 May 3 20:52 2 -rw-r--r-- 1 tritan mit 0 May 3 20:52 1 [calloway:ttypa:/tmp] tritan% touch 2 [calloway:ttypa:/tmp] tritan% ls -lt 1 2 -rw-r--r-- 1 tritan mit 0 May 3 20:53 2 -rw-r--r-- 1 tritan mit 0 May 3 20:52 1 [calloway:ttypa:/tmp] tritan% ls -lt 2 1 -rw-r--r-- 1 tritan mit 0 May 3 20:53 2 -rw-r--r-- 1 tritan mit 0 May 3 20:52 1 Change the code to fail safe in this case. Revision Changes Path 1.1344 +4 -0 apache-1.3/src/CHANGES Index: CHANGES =================================================================== RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1343 retrieving revision 1.1344 diff -u -r1.1343 -r1.1344 --- CHANGES 1999/05/04 00:20:02 1.1343 +++ CHANGES 1999/05/04 01:07:29 1.1344 @@ -1,5 +1,9 @@ Changes with Apache 1.3.7 + *) Fix minor but annoying bug with the test for Configuration.tmpl + being newer than Configuration so that it is less likely to fail + when using APACI and shadow sources. [Wilfredo Sanchez] + *) PORT: Add initial support for Mac OS (versions 10.0 and greater). Use Mac OS X Server layout for now. Clean up dyld code in unix/os.c, and don't install the dyld error handlers, which 1.341 +1 -1 apache-1.3/src/Configure Index: Configure =================================================================== RCS file: /home/cvs/apache-1.3/src/Configure,v retrieving revision 1.340 retrieving revision 1.341 diff -u -r1.340 -r1.341 --- Configure 1999/05/03 23:07:42 1.340 +++ Configure 1999/05/04 01:07:30 1.341 @@ -109,7 +109,7 @@ ## Now see if Configuration.tmpl is more recent than $file. If ## so, then we complain and bail out ## -if ls -lt Configuration.tmpl $file | head -1 | \ +if ls -lt $file Configuration.tmpl | head -1 | \ grep 'Configuration.tmpl' > /dev/null then echo "Configuration.tmpl is more recent than $file;"