You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by rj...@apache.org on 2010/11/26 15:25:45 UTC
svn commit: r1039373 - in /apr/apr-util/branches/1.3.x: ./
buckets/apr_brigade.c dbd/apr_dbd_pgsql.c misc/apr_queue.c
test/NWGNUaputest xml/expat/ xml/expat/conftools/PrintPath
Author: rjung
Date: Fri Nov 26 14:25:45 2010
New Revision: 1039373
URL: http://svn.apache.org/viewvc?rev=1039373&view=rev
Log:
Backport r1002504 from 1.5.x.
License text and comment. No functional change.
Modified:
apr/apr-util/branches/1.3.x/ (props changed)
apr/apr-util/branches/1.3.x/buckets/apr_brigade.c (props changed)
apr/apr-util/branches/1.3.x/dbd/apr_dbd_pgsql.c (props changed)
apr/apr-util/branches/1.3.x/misc/apr_queue.c (props changed)
apr/apr-util/branches/1.3.x/test/NWGNUaputest (props changed)
apr/apr-util/branches/1.3.x/xml/expat/ (props changed)
apr/apr-util/branches/1.3.x/xml/expat/conftools/PrintPath
Propchange: apr/apr-util/branches/1.3.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 26 14:25:45 2010
@@ -1,4 +1,4 @@
/apr/apr/trunk:781403,784592,789965,794508
/apr/apr-util/branches/1.3.x:692751
-/apr/apr-util/branches/1.5.x:1002584-1002585,1002620,1002622-1002623,1002628,1002647,1002975
+/apr/apr-util/branches/1.5.x:1002504,1002584-1002585,1002620,1002622-1002623,1002628,1002647,1002975
/apr/apr-util/trunk:692751,731225,743986,744009,745771,747612,747623,747630,781403
Propchange: apr/apr-util/branches/1.3.x/buckets/apr_brigade.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 26 14:25:45 2010
@@ -1,4 +1,4 @@
/apr/apr/trunk/buckets/apr_brigade.c:768417,781403,784592,789965,794508
/apr/apr-util/branches/1.3.x/buckets/apr_brigade.c:692751
-/apr/apr-util/branches/1.5.x/buckets/apr_brigade.c:1002584-1002585,1002620,1002622-1002623,1002628,1002647,1002975
+/apr/apr-util/branches/1.5.x/buckets/apr_brigade.c:1002504,1002584-1002585,1002620,1002622-1002623,1002628,1002647,1002975
/apr/apr-util/trunk/buckets/apr_brigade.c:692751,731225,743986,744009,745771,747612,747623,747630,781403
Propchange: apr/apr-util/branches/1.3.x/dbd/apr_dbd_pgsql.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 26 14:25:45 2010
@@ -1,4 +1,4 @@
/apr/apr/trunk/dbd/apr_dbd_pgsql.c:781403,784592,789965,794508
/apr/apr-util/branches/1.3.x/dbd/apr_dbd_pgsql.c:692751
-/apr/apr-util/branches/1.5.x/dbd/apr_dbd_pgsql.c:1002584-1002585,1002620,1002622-1002623,1002628,1002647,1002975
+/apr/apr-util/branches/1.5.x/dbd/apr_dbd_pgsql.c:1002504,1002584-1002585,1002620,1002622-1002623,1002628,1002647,1002975
/apr/apr-util/trunk/dbd/apr_dbd_pgsql.c:692751,704986,731225,743986,744009,745771,747612,747623,747630,781403
Propchange: apr/apr-util/branches/1.3.x/misc/apr_queue.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 26 14:25:45 2010
@@ -1,5 +1,5 @@
/apr/apr/trunk/misc/apr_queue.c:781403,784592,789965,794508
/apr/apr/trunk/util-misc/apr_queue.c:784520
/apr/apr-util/branches/1.3.x/misc/apr_queue.c:692751
-/apr/apr-util/branches/1.5.x/misc/apr_queue.c:1002584-1002585,1002620,1002622-1002623,1002628,1002647,1002975
+/apr/apr-util/branches/1.5.x/misc/apr_queue.c:1002504,1002584-1002585,1002620,1002622-1002623,1002628,1002647,1002975
/apr/apr-util/trunk/misc/apr_queue.c:692751,731225,743986,744009,745771,747612,747623,747630,781403
Propchange: apr/apr-util/branches/1.3.x/test/NWGNUaputest
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 26 14:25:45 2010
@@ -1,4 +1,4 @@
/apr/apr/trunk/test/nwgnuaputest:781403,784592,789965
/apr/apr-util/branches/1.3.x/test/nwgnuaputest:692751
-/apr/apr-util/branches/1.5.x/test/NWGNUaputest:1002584-1002585,1002620,1002622-1002623,1002628,1002647,1002975
+/apr/apr-util/branches/1.5.x/test/NWGNUaputest:1002504,1002584-1002585,1002620,1002622-1002623,1002628,1002647,1002975
/apr/apr-util/trunk/test/nwgnuaputest:692751,731225,743986,744009,745771,747612,747623,747630,781403
Propchange: apr/apr-util/branches/1.3.x/xml/expat/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 26 14:25:45 2010
@@ -1,6 +1,6 @@
/apr/apr/trunk/xml/expat:781403,784592,789965,794508
/apr/apr-util/branches/1.3.x/xml/expat:692751
-/apr/apr-util/branches/1.5.x/xml/expat:1002584-1002585,1002620,1002622-1002623,1002628,1002647,1002975
+/apr/apr-util/branches/1.5.x/xml/expat:1002504,1002584-1002585,1002620,1002622-1002623,1002628,1002647,1002975
/apr/apr-util/trunk/xml/expat:692751,731225,743986,744009,745771,747612,747623,747630,781403
/apr/apr-util/vendor/expat/1.95.7:1002560-1002564
/apr/apr-util/vendor/expat/current:1002513-1002559
Modified: apr/apr-util/branches/1.3.x/xml/expat/conftools/PrintPath
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/xml/expat/conftools/PrintPath?rev=1039373&r1=1039372&r2=1039373&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/xml/expat/conftools/PrintPath (original)
+++ apr/apr-util/branches/1.3.x/xml/expat/conftools/PrintPath Fri Nov 26 14:25:45 2010
@@ -1,4 +1,21 @@
#!/bin/sh
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+#
# Look for program[s] somewhere in $PATH.
#
# Options:
@@ -12,9 +29,6 @@
#
# Initially written by Jim Jagielski for the Apache configuration mechanism
# (with kudos to Kernighan/Pike)
-#
-# This script falls under the Apache License.
-# See http://www.apache.org/docs/LICENSE
##
# Some "constants"
@@ -45,7 +59,7 @@ done
#
# First of all, all OS/2 programs have the '.exe' extension.
# Next, we adjust PATH (or what was given to us as PATH) to
-# be whitespace seperated directories.
+# be whitespace separated directories.
# Finally, we try to determine the best flag to use for
# test/[] to look for an executable file. OS/2 just has '-r'
# but with other OSs, we do some funny stuff to check to see