Author: covener
Date: Wed Dec 9 01:27:49 2009
New Revision: 888669
URL: http://svn.apache.org/viewvc?rev=888669&view=rev
Log:
let HP-UX on IA64 fall through to the default unix case, using .so instead of .sl.
A quick scan of a couple years of dev@apr only turned up one person reporting
results on this platform, and they had the 8/9 testdso failures as well.
Modified:
apr/apr/trunk/test/testdso.c
Modified: apr/apr/trunk/test/testdso.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/testdso.c?rev=888669&r1=888668&r2=888669&view=diff
==============================================================================
--- apr/apr/trunk/test/testdso.c (original)
+++ apr/apr/trunk/test/testdso.c Wed Dec 9 01:27:49 2009
@@ -38,7 +38,7 @@
#elif defined(DARWIN)
# define MOD_NAME ".libs/mod_test.so"
# define LIB_NAME ".libs/libmod_test.dylib"
-#elif defined(__hpux__) || defined(__hpux)
+#elif (defined(__hpux__) || defined(__hpux)) && !defined(__ia64)
# define MOD_NAME ".libs/mod_test.sl"
# define LIB_NAME ".libs/libmod_test.sl"
#elif defined(_AIX) || defined(__bsdi__)
Author: wrowe
Date: Tue Dec 8 05:09:10 2009
New Revision: 888265
URL: http://svn.apache.org/viewvc?rev=888265&view=rev
Log:
And at 1.4.2 now
Modified:
apr/apr/branches/1.4.x/CHANGES
apr/apr/branches/1.4.x/include/apr_version.h
Modified: apr/apr/branches/1.4.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/CHANGES?rev=888265&r1=888264&r2=888265&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/CHANGES [utf-8] (original)
+++ apr/apr/branches/1.4.x/CHANGES [utf-8] Tue Dec 8 05:09:10 2009
@@ -1,4 +1,8 @@
-*- coding: utf-8 -*-
+Changes for APR 1.4.2
+
+
+
Changes for APR 1.4.1
*) Win32: Properly handle the ERROR_DIRECTORY system error code.
Modified: apr/apr/branches/1.4.x/include/apr_version.h
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/include/apr_version.h?rev=888265&r1=888264&r2=888265&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/include/apr_version.h (original)
+++ apr/apr/branches/1.4.x/include/apr_version.h Tue Dec 8 05:09:10 2009
@@ -59,14 +59,14 @@
* The Patch Level never includes API changes, simply bug fixes.
* Reset to 0 when upgrading APR_MINOR_VERSION
*/
-#define APR_PATCH_VERSION 1
+#define APR_PATCH_VERSION 2
/**
* The symbol APR_IS_DEV_VERSION is only defined for internal,
* "development" copies of APR. It is undefined for released versions
* of APR.
*/
-/* #undef APR_IS_DEV_VERSION */
+#define APR_IS_DEV_VERSION
/**
* Check at compile time if the APR version is at least a certain
Author: wrowe
Date: Tue Dec 8 05:07:03 2009
New Revision: 888264
URL: http://svn.apache.org/viewvc?rev=888264&view=rev
Log:
Tag initial 1.4.1 so there is no ambiguity between httpd-shipped and apr-shipped
Added:
apr/apr/tags/1.4.1/
- copied from r888263, apr/apr/branches/1.4.x/
Author: wrowe
Date: Tue Dec 8 05:05:45 2009
New Revision: 888263
URL: http://svn.apache.org/viewvc?rev=888263&view=rev
Log:
Identify one change between httpd-shipped 1.4.0 and this tag 1.4.1, and prepare to tag
Modified:
apr/apr/branches/1.4.x/CHANGES
apr/apr/branches/1.4.x/STATUS
apr/apr/branches/1.4.x/include/apr_version.h
Modified: apr/apr/branches/1.4.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/CHANGES?rev=888263&r1=888262&r2=888263&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/CHANGES [utf-8] (original)
+++ apr/apr/branches/1.4.x/CHANGES [utf-8] Tue Dec 8 05:05:45 2009
@@ -1,4 +1,9 @@
-*- coding: utf-8 -*-
+Changes for APR 1.4.1
+
+ *) Win32: Properly handle the ERROR_DIRECTORY system error code.
+ [Brane Čibej]
+
Changes for APR 1.4.0
*) Add apr_global_mutex_lockfile() for retrieving the file, if any,
@@ -34,9 +39,6 @@
*) Add apr_file_link() function. PR 44841. [Mark Heily <mark heily.com>]
- *) Win32: Properly handle the ERROR_DIRECTORY system error code.
- [Brane Čibej]
-
Changes for APR 1.3.x and later:
*) http://svn.apache.org/viewvc/apr/apr/branches/1.3.x/CHANGES?view=markup
Modified: apr/apr/branches/1.4.x/STATUS
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/STATUS?rev=888263&r1=888262&r2=888263&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/STATUS [utf-8] (original)
+++ apr/apr/branches/1.4.x/STATUS [utf-8] Tue Dec 8 05:05:45 2009
@@ -4,7 +4,9 @@
Releases:
2.0.0 : in development on trunk/
1.5.0 : in development on branches/1.5.x/
- 1.4.0 : in development on branches/1.4.x/
+ 1.4.2 : in development on branches/1.4.x/
+ 1.4.1 : tagged December 7, 2009
+ 1.4.0 : not released
1.3.9 : released September 23, 2009
1.3.8 : released August 6, 2009
1.3.7 : released July 23, 2009
Modified: apr/apr/branches/1.4.x/include/apr_version.h
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/include/apr_version.h?rev=888263&r1=888262&r2=888263&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/include/apr_version.h (original)
+++ apr/apr/branches/1.4.x/include/apr_version.h Tue Dec 8 05:05:45 2009
@@ -59,14 +59,14 @@
* The Patch Level never includes API changes, simply bug fixes.
* Reset to 0 when upgrading APR_MINOR_VERSION
*/
-#define APR_PATCH_VERSION 0
+#define APR_PATCH_VERSION 1
/**
* The symbol APR_IS_DEV_VERSION is only defined for internal,
* "development" copies of APR. It is undefined for released versions
* of APR.
*/
-#define APR_IS_DEV_VERSION
+/* #undef APR_IS_DEV_VERSION */
/**
* Check at compile time if the APR version is at least a certain
Author: wrowe
Date: Tue Dec 8 04:57:47 2009
New Revision: 888261
URL: http://svn.apache.org/viewvc?rev=888261&view=rev
Log:
Paul tagged this as 1.4.x-r833920, clear enough
Removed:
apr/apr-util/tags/1.4.0-dev-r833920/
Author: wrowe
Date: Tue Dec 8 04:57:38 2009
New Revision: 888260
URL: http://svn.apache.org/viewvc?rev=888260&view=rev
Log:
Paul tagged this as 1.4.x-r833920, clear enough
Removed:
apr/apr/tags/1.4.0-dev-r833920/
Author: wrowe
Date: Fri Dec 4 05:51:06 2009
New Revision: 887078
URL: http://svn.apache.org/viewvc?rev=887078&view=rev
Log:
catch up with release activity
Modified:
apr/apr-util/branches/1.3.x/STATUS
Modified: apr/apr-util/branches/1.3.x/STATUS
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/STATUS?rev=887078&r1=887077&r2=887078&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/STATUS [utf-8] (original)
+++ apr/apr-util/branches/1.3.x/STATUS [utf-8] Fri Dec 4 05:51:06 2009
@@ -3,10 +3,10 @@
Releases:
- 2.0.0 : EOL - merged into apr/trunk/
+ 2.0.0 : None/EOL - merged into apr/trunk/
+ 1.5.0 : in development on branches/1.5.x/
1.4.0 : in development on branches/1.4.x/
- 1.3.10 : in development on branches/1.3.x/
- 1.3.9 : tagged August 4, 2009
+ 1.3.9 : released August 5, 2009
1.3.8 : released July 6, 2009
1.3.7 : released June 5, 2009
1.3.6 : not released
Author: wrowe
Date: Fri Dec 4 05:50:59 2009
New Revision: 887077
URL: http://svn.apache.org/viewvc?rev=887077&view=rev
Log:
catch up with release activity
Modified:
apr/apr-util/branches/1.4.x/STATUS
Modified: apr/apr-util/branches/1.4.x/STATUS
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/STATUS?rev=887077&r1=887076&r2=887077&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/STATUS [utf-8] (original)
+++ apr/apr-util/branches/1.4.x/STATUS [utf-8] Fri Dec 4 05:50:59 2009
@@ -2,9 +2,18 @@
Last modified at [$Date$]
Releases:
- 2.0.0 : in development on trunk/
+ 2.0.0 : None/EOL - merged into apr/trunk/
+ 1.5.0 : in development on branches/1.5.x/
1.4.0 : in development on branches/1.4.x/
- 1.3.1 : in maintenance on branches/1.3.x/
+ 1.3.9 : released August 5, 2009
+ 1.3.8 : released July 6, 2009
+ 1.3.7 : released June 5, 2009
+ 1.3.6 : not released
+ 1.3.5 : not released
+ 1.3.4 : released August 15, 2008
+ 1.3.3 : not released
+ 1.3.2 : released June 23, 2008
+ 1.3.1 : not released
1.3.0 : released June 3, 2008
1.2.12 : released November 25, 2007
1.2.11 : not released
Author: wrowe
Date: Fri Dec 4 05:50:56 2009
New Revision: 887076
URL: http://svn.apache.org/viewvc?rev=887076&view=rev
Log:
catch up with release activity
Modified:
apr/apr-util/branches/1.5.x/STATUS
apr/apr-util/branches/1.5.x/include/apu_version.h
Modified: apr/apr-util/branches/1.5.x/STATUS
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/STATUS?rev=887076&r1=887075&r2=887076&view=diff
==============================================================================
--- apr/apr-util/branches/1.5.x/STATUS [utf-8] (original)
+++ apr/apr-util/branches/1.5.x/STATUS [utf-8] Fri Dec 4 05:50:56 2009
@@ -2,9 +2,18 @@
Last modified at [$Date$]
Releases:
- 2.0.0 : in development on trunk/
+ 2.0.0 : None/EOL - merged into apr/trunk/
+ 1.5.0 : in development on branches/1.5.x/
1.4.0 : in development on branches/1.4.x/
- 1.3.1 : in maintenance on branches/1.3.x/
+ 1.3.9 : released August 5, 2009
+ 1.3.8 : released July 6, 2009
+ 1.3.7 : released June 5, 2009
+ 1.3.6 : not released
+ 1.3.5 : not released
+ 1.3.4 : released August 15, 2008
+ 1.3.3 : not released
+ 1.3.2 : released June 23, 2008
+ 1.3.1 : not released
1.3.0 : released June 3, 2008
1.2.12 : released November 25, 2007
1.2.11 : not released
Modified: apr/apr-util/branches/1.5.x/include/apu_version.h
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/include/apu_version.h?rev=887076&r1=887075&r2=887076&view=diff
==============================================================================
--- apr/apr-util/branches/1.5.x/include/apu_version.h (original)
+++ apr/apr-util/branches/1.5.x/include/apu_version.h Fri Dec 4 05:50:56 2009
@@ -53,7 +53,7 @@
* Minor API changes that do not cause binary compatibility problems.
* Reset to 0 when upgrading APU_MAJOR_VERSION
*/
-#define APU_MINOR_VERSION 4
+#define APU_MINOR_VERSION 5
/** patch level
* The Patch Level never includes API changes, simply bug fixes.
Author: wrowe
Date: Fri Dec 4 05:50:29 2009
New Revision: 887075
URL: http://svn.apache.org/viewvc?rev=887075&view=rev
Log:
catch up with release activity
Modified:
apr/apr/branches/1.3.x/STATUS
Modified: apr/apr/branches/1.3.x/STATUS
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.3.x/STATUS?rev=887075&r1=887074&r2=887075&view=diff
==============================================================================
--- apr/apr/branches/1.3.x/STATUS [utf-8] (original)
+++ apr/apr/branches/1.3.x/STATUS [utf-8] Fri Dec 4 05:50:29 2009
@@ -5,7 +5,7 @@
2.0.0 : in development on trunk/
1.5.0 : in development on branches/1.5.x/
1.4.0 : in development on branches/1.4.x/
- 1.3.9 : tagged September 21, 2009
+ 1.3.9 : released September 23, 2009
1.3.8 : released August 6, 2009
1.3.7 : released July 23, 2009
1.3.6 : released July 4, 2009
Author: wrowe
Date: Fri Dec 4 05:50:25 2009
New Revision: 887074
URL: http://svn.apache.org/viewvc?rev=887074&view=rev
Log:
catch up with release activity
Modified:
apr/apr/branches/1.4.x/STATUS
Modified: apr/apr/branches/1.4.x/STATUS
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/STATUS?rev=887074&r1=887073&r2=887074&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/STATUS [utf-8] (original)
+++ apr/apr/branches/1.4.x/STATUS [utf-8] Fri Dec 4 05:50:25 2009
@@ -5,7 +5,7 @@
2.0.0 : in development on trunk/
1.5.0 : in development on branches/1.5.x/
1.4.0 : in development on branches/1.4.x/
- 1.3.9 : released September 21, 2009
+ 1.3.9 : released September 23, 2009
1.3.8 : released August 6, 2009
1.3.7 : released July 23, 2009
1.3.6 : released July 4, 2009
Author: wrowe
Date: Fri Dec 4 05:50:21 2009
New Revision: 887073
URL: http://svn.apache.org/viewvc?rev=887073&view=rev
Log:
catch up with release activity
Modified:
apr/apr/branches/1.5.x/STATUS
Modified: apr/apr/branches/1.5.x/STATUS
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/STATUS?rev=887073&r1=887072&r2=887073&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/STATUS [utf-8] (original)
+++ apr/apr/branches/1.5.x/STATUS [utf-8] Fri Dec 4 05:50:21 2009
@@ -5,7 +5,7 @@
2.0.0 : in development on trunk/
1.5.0 : in development on branches/1.5.x/
1.4.0 : in development on branches/1.4.x/
- 1.3.9 : tagged September 21, 2009
+ 1.3.9 : released September 23, 2009
1.3.8 : released August 6, 2009
1.3.7 : released July 23, 2009
1.3.6 : released July 4, 2009
Author: wrowe
Date: Fri Dec 4 05:50:14 2009
New Revision: 887072
URL: http://svn.apache.org/viewvc?rev=887072&view=rev
Log:
catch up with release activity
Modified:
apr/apr/trunk/STATUS
Modified: apr/apr/trunk/STATUS
URL: http://svn.apache.org/viewvc/apr/apr/trunk/STATUS?rev=887072&r1=887071&r2=887072&view=diff
==============================================================================
--- apr/apr/trunk/STATUS [utf-8] (original)
+++ apr/apr/trunk/STATUS [utf-8] Fri Dec 4 05:50:14 2009
@@ -29,7 +29,7 @@
2.0.0 : in development on trunk/
1.5.0 : in development on branches/1.5.x/
1.4.0 : in development on branches/1.4.x/
- 1.3.9 : tagged September 21, 2009
+ 1.3.9 : released September 23, 2009
1.3.8 : released August 6, 2009
1.3.7 : released July 23, 2009
1.3.6 : released July 4, 2009
Author: wrowe
Date: Fri Dec 4 05:34:50 2009
New Revision: 887070
URL: http://svn.apache.org/viewvc?rev=887070&view=rev
Log:
catch up with release activity
Modified:
apr/apr/branches/1.3.x/STATUS
Modified: apr/apr/branches/1.3.x/STATUS
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.3.x/STATUS?rev=887070&r1=887069&r2=887070&view=diff
==============================================================================
--- apr/apr/branches/1.3.x/STATUS [utf-8] (original)
+++ apr/apr/branches/1.3.x/STATUS [utf-8] Fri Dec 4 05:34:50 2009
@@ -3,8 +3,8 @@
Releases:
2.0.0 : in development on trunk/
+ 1.5.0 : in development on branches/1.5.x/
1.4.0 : in development on branches/1.4.x/
- 1.3.10 : in development on branches/1.3.x/
1.3.9 : tagged September 21, 2009
1.3.8 : released August 6, 2009
1.3.7 : released July 23, 2009
Author: wrowe
Date: Fri Dec 4 05:34:45 2009
New Revision: 887069
URL: http://svn.apache.org/viewvc?rev=887069&view=rev
Log:
catch up with release activity
Modified:
apr/apr/branches/1.4.x/STATUS
Modified: apr/apr/branches/1.4.x/STATUS
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/STATUS?rev=887069&r1=887068&r2=887069&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/STATUS [utf-8] (original)
+++ apr/apr/branches/1.4.x/STATUS [utf-8] Fri Dec 4 05:34:45 2009
@@ -3,8 +3,14 @@
Releases:
2.0.0 : in development on trunk/
+ 1.5.0 : in development on branches/1.5.x/
1.4.0 : in development on branches/1.4.x/
- 1.3.4 : in development on branches/1.3.x/
+ 1.3.9 : released September 21, 2009
+ 1.3.8 : released August 6, 2009
+ 1.3.7 : released July 23, 2009
+ 1.3.6 : released July 4, 2009
+ 1.3.5 : released June 5, 2009
+ 1.3.4 : not released
1.3.3 : released August 14, 2008
1.3.2 : released June 23, 2008
1.3.1 : not released
Author: wrowe
Date: Fri Dec 4 05:22:53 2009
New Revision: 887066
URL: http://svn.apache.org/viewvc?rev=887066&view=rev
Log:
Catch up with branch and release activity
Modified:
apr/apr/branches/1.5.x/STATUS
apr/apr/branches/1.5.x/include/apr_version.h
Modified: apr/apr/branches/1.5.x/STATUS
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/STATUS?rev=887066&r1=887065&r2=887066&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/STATUS [utf-8] (original)
+++ apr/apr/branches/1.5.x/STATUS [utf-8] Fri Dec 4 05:22:53 2009
@@ -3,8 +3,14 @@
Releases:
2.0.0 : in development on trunk/
+ 1.5.0 : in development on branches/1.5.x/
1.4.0 : in development on branches/1.4.x/
- 1.3.4 : in development on branches/1.3.x/
+ 1.3.9 : tagged September 21, 2009
+ 1.3.8 : released August 6, 2009
+ 1.3.7 : released July 23, 2009
+ 1.3.6 : released July 4, 2009
+ 1.3.5 : released June 5, 2009
+ 1.3.4 : not released
1.3.3 : released August 14, 2008
1.3.2 : released June 23, 2008
1.3.1 : not released
Modified: apr/apr/branches/1.5.x/include/apr_version.h
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/include/apr_version.h?rev=887066&r1=887065&r2=887066&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/include/apr_version.h (original)
+++ apr/apr/branches/1.5.x/include/apr_version.h Fri Dec 4 05:22:53 2009
@@ -53,7 +53,7 @@
* Minor API changes that do not cause binary compatibility problems.
* Reset to 0 when upgrading APR_MAJOR_VERSION
*/
-#define APR_MINOR_VERSION 4
+#define APR_MINOR_VERSION 5
/** patch level
* The Patch Level never includes API changes, simply bug fixes.
Author: wrowe
Date: Fri Dec 4 05:22:43 2009
New Revision: 887065
URL: http://svn.apache.org/viewvc?rev=887065&view=rev
Log:
Catch up with branch and release activity
Modified:
apr/apr/trunk/STATUS
Modified: apr/apr/trunk/STATUS
URL: http://svn.apache.org/viewvc/apr/apr/trunk/STATUS?rev=887065&r1=887064&r2=887065&view=diff
==============================================================================
--- apr/apr/trunk/STATUS [utf-8] (original)
+++ apr/apr/trunk/STATUS [utf-8] Fri Dec 4 05:22:43 2009
@@ -5,24 +5,36 @@
* http://svn.apache.org/repos/asf/apr/apr/trunk/STATUS
+
+NOTICE:
+
Effective with version 2.0 , apr-util ceases to exist. For reference,
the final standalone apr-util can be found in subversion at:
* http://svn.apache.org/repos/asf/apr/apr-util/branches -r784519
+
Patches considered for backport are noted in their branches' STATUS:
* http://svn.apache.org/repos/asf/apr/apr/branches/0.9.x/STATUS
* http://svn.apache.org/repos/asf/apr/apr/branches/1.3.x/STATUS
* http://svn.apache.org/repos/asf/apr/apr/branches/1.4.x/STATUS
+ * http://svn.apache.org/repos/asf/apr/apr/branches/1.5.x/STATUS
* http://svn.apache.org/repos/asf/apr/apr-util/branches/0.9.x/STATUS
* http://svn.apache.org/repos/asf/apr/apr-util/branches/1.3.x/STATUS
* http://svn.apache.org/repos/asf/apr/apr-util/branches/1.4.x/STATUS
+ * http://svn.apache.org/repos/asf/apr/apr-util/branches/1.5.x/STATUS
Releases:
2.0.0 : in development on trunk/
+ 1.5.0 : in development on branches/1.5.x/
1.4.0 : in development on branches/1.4.x/
- 1.3.4 : in development on branches/1.3.x/
+ 1.3.9 : tagged September 21, 2009
+ 1.3.8 : released August 6, 2009
+ 1.3.7 : released July 23, 2009
+ 1.3.6 : released July 4, 2009
+ 1.3.5 : released June 5, 2009
+ 1.3.4 : not released
1.3.3 : released August 14, 2008
1.3.2 : released June 23, 2008
1.3.1 : not released
Author: wrowe
Date: Thu Dec 3 23:57:30 2009
New Revision: 887002
URL: http://svn.apache.org/viewvc?rev=887002&view=rev
Log:
Branch for apr 1.5.x potential development
Added:
apr/apr/branches/1.5.x/
- copied from r887001, apr/apr/branches/1.4.x/
Author: wrowe
Date: Thu Dec 3 23:57:15 2009
New Revision: 887001
URL: http://svn.apache.org/viewvc?rev=887001&view=rev
Log:
Branch for apr 1.5.x potential development
Added:
apr/apr-util/branches/1.5.x/
- copied from r887000, apr/apr-util/branches/1.4.x/
Author: wrowe
Date: Thu Dec 3 23:56:06 2009
New Revision: 887000
URL: http://svn.apache.org/viewvc?rev=887000&view=rev
Log:
More correctly, this is 1.4.0-dev-r833920 as shipped in /release/httpd/ r38
Added:
apr/apr/tags/1.4.0-dev-r833920/
- copied from r886999, apr/apr/tags/1.4.0/
Removed:
apr/apr/tags/1.4.0/
Author: wrowe
Date: Thu Dec 3 23:55:52 2009
New Revision: 886999
URL: http://svn.apache.org/viewvc?rev=886999&view=rev
Log:
More correctly, this is 1.4.0-dev-r833920 as shipped in /release/httpd/ r38
Added:
apr/apr-util/tags/1.4.0-dev-r833920/
- copied from r886998, apr/apr-util/tags/1.4.0/
Removed:
apr/apr-util/tags/1.4.0/
Author: wrowe
Date: Thu Dec 3 23:55:20 2009
New Revision: 886996
URL: http://svn.apache.org/viewvc?rev=886996&view=rev
Log:
revert rename of the branch; cp @rev
Added:
apr/apr-util/branches/1.4.x/
- copied from r886992, apr/apr-util/branches/1.4.x/
Author: wrowe
Date: Thu Dec 3 23:51:43 2009
New Revision: 886994
URL: http://svn.apache.org/viewvc?rev=886994&view=rev
Log:
Revert rename of the branch; rm, followed by a cp @rev
Removed:
apr/apr-util/tags/1.4.0-dev-r833920/
Author: wrowe
Date: Thu Dec 3 23:50:16 2009
New Revision: 886993
URL: http://svn.apache.org/viewvc?rev=886993&view=rev
Log:
More correctly, this is 1.4.0-dev-r833920 as shipped in /release/httpd/ r38
Added:
apr/apr-util/tags/1.4.0-dev-r833920/
- copied from r886992, apr/apr-util/branches/1.4.x/
Removed:
apr/apr-util/branches/1.4.x/
Author: wrowe
Date: Thu Dec 3 23:36:42 2009
New Revision: 886989
URL: http://svn.apache.org/viewvc?rev=886989&view=rev
Log:
Tag as shipped in /dist/release/httpd/ commit 38
Added:
apr/apr-util/tags/1.4.0/
- copied from r833920, apr/apr-util/branches/1.4.x/
Author: wrowe
Date: Thu Dec 3 23:36:10 2009
New Revision: 886988
URL: http://svn.apache.org/viewvc?rev=886988&view=rev
Log:
Tag as shipped in /dist/release/httpd/ commit 38
Added:
apr/apr/tags/1.4.0/
- copied from r833920, apr/apr/branches/1.4.x/
Author: fuankg
Date: Wed Dec 2 01:10:07 2009
New Revision: 886029
URL: http://svn.apache.org/viewvc?rev=886029&view=rev
Log:
removed trailing spaces.
Modified:
apr/apr/branches/1.4.x/include/apr_errno.h
Modified: apr/apr/branches/1.4.x/include/apr_errno.h
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/include/apr_errno.h?rev=886029&r1=886028&r2=886029&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/include/apr_errno.h (original)
+++ apr/apr/branches/1.4.x/include/apr_errno.h Wed Dec 2 01:10:07 2009
@@ -34,7 +34,7 @@
/**
* @defgroup apr_errno Error Codes
- * @ingroup APR
+ * @ingroup APR
* @{
*/
@@ -49,7 +49,7 @@
* @param buf A buffer to hold the error string.
* @param bufsize Size of the buffer to hold the string.
*/
-APR_DECLARE(char *) apr_strerror(apr_status_t statcode, char *buf,
+APR_DECLARE(char *) apr_strerror(apr_status_t statcode, char *buf,
apr_size_t bufsize);
#if defined(DOXYGEN)
@@ -69,7 +69,7 @@
* Fold an apr_status_t code back to the native platform defined error.
* @param e The apr_status_t folded platform os error code.
* @warning macro implementation; the statcode argument may be evaluated
- * multiple times. If the statcode was not created by apr_get_os_error
+ * multiple times. If the statcode was not created by apr_get_os_error
* or APR_FROM_OS_ERROR, the results are undefined.
*/
#define APR_TO_OS_ERROR(e) (e == 0 ? APR_SUCCESS : e - APR_OS_START_SYSERR)
@@ -105,7 +105,7 @@
* @warning This is a macro implementation; the statcode argument may be evaluated
* multiple times. If the statcode was not created by apr_get_os_error
* or APR_FROM_OS_ERROR, the results are undefined. This macro sets
- * errno, or calls a WSASetLastError() style function, unfolding
+ * errno, or calls a WSASetLastError() style function, unfolding
* socketcode with APR_TO_OS_ERROR.
*/
@@ -149,7 +149,7 @@
*
* In general applications should try and create unique error codes. To try
* and assist in finding suitable ranges of numbers to use, the following
- * ranges are known to be used by the listed applications. If your
+ * ranges are known to be used by the listed applications. If your
* application defines error codes please advise the range of numbers it
* uses to dev@apr.apache.org for inclusion in this list.
*
@@ -172,12 +172,12 @@
#define APR_OS_START_CANONERR (APR_OS_START_USERERR \
+ (APR_OS_ERRSPACE_SIZE * 10))
/**
- * APR_OS_START_EAIERR folds EAI_ error codes from getaddrinfo() into
+ * APR_OS_START_EAIERR folds EAI_ error codes from getaddrinfo() into
* apr_status_t values.
*/
#define APR_OS_START_EAIERR (APR_OS_START_CANONERR + APR_OS_ERRSPACE_SIZE)
/**
- * APR_OS_START_SYSERR folds platform-specific system error values into
+ * APR_OS_START_SYSERR folds platform-specific system error values into
* apr_status_t values.
*/
#define APR_OS_START_SYSERR (APR_OS_START_EAIERR + APR_OS_ERRSPACE_SIZE)
@@ -188,7 +188,7 @@
* The following attempts to show the relation of the various constants
* used for mapping APR Status codes.
*
- * 0
+ * 0
*
* 20,000 APR_OS_START_ERROR
*
@@ -222,13 +222,13 @@
/** no error. */
#define APR_SUCCESS 0
-/**
+/**
* @defgroup APR_Error APR Error Values
* <PRE>
* <b>APR ERROR VALUES</b>
- * APR_ENOSTAT APR was unable to perform a stat on the file
+ * APR_ENOSTAT APR was unable to perform a stat on the file
* APR_ENOPOOL APR was not provided a pool with which to allocate memory
- * APR_EBADDATE APR was given an invalid date
+ * APR_EBADDATE APR was given an invalid date
* APR_EINVALSOCK APR was given an invalid socket
* APR_ENOPROC APR was not given a process structure
* APR_ENOTIME APR was not given a time structure
@@ -239,7 +239,7 @@
* APR_ENOTHREAD APR was not given a thread structure
* APR_ENOTHDKEY APR was not given a thread key structure
* APR_ENOSHMAVAIL There is no more shared memory available
- * APR_EDSOOPEN APR was unable to open the dso object. For more
+ * APR_EDSOOPEN APR was unable to open the dso object. For more
* information call apr_dso_error().
* APR_EGENERAL General failure (specific information not available)
* APR_EBADIP The specified IP address is invalid
@@ -260,17 +260,17 @@
* APR_INCOMPLETE The operation was incomplete although some processing
* was performed and the results are partially valid
* APR_BADCH Getopt found an option not in the option string
- * APR_BADARG Getopt found an option that is missing an argument
+ * APR_BADARG Getopt found an option that is missing an argument
* and an argument was specified in the option string
* APR_EOF APR has encountered the end of the file
* APR_NOTFOUND APR was unable to find the socket in the poll structure
* APR_ANONYMOUS APR is using anonymous shared memory
* APR_FILEBASED APR is using a file name as the key to the shared memory
* APR_KEYBASED APR is using a shared key as the key to the shared memory
- * APR_EINIT Ininitalizer value. If no option has been found, but
+ * APR_EINIT Ininitalizer value. If no option has been found, but
* the status variable requires a value, this should be used
- * APR_ENOTIMPL The APR function has not been implemented on this
- * platform, either because nobody has gotten to it yet,
+ * APR_ENOTIMPL The APR function has not been implemented on this
+ * platform, either because nobody has gotten to it yet,
* or the function is impossible on this platform.
* APR_EMISMATCH Two passwords do not match.
* APR_EABSOLUTE The given path was absolute.
@@ -338,7 +338,7 @@
#define APR_ENOTENOUGHENTROPY (APR_OS_START_ERROR + 28)
/** @} */
-/**
+/**
* @defgroup APR_STATUS_IS Status Value Tests
* @warning For any particular error condition, more than one of these tests
* may match. This is because platform-specific error codes may not
@@ -349,16 +349,16 @@
* adjust the order of the tests accordingly.
* @{
*/
-/**
- * APR was unable to perform a stat on the file
+/**
+ * APR was unable to perform a stat on the file
* @warning always use this test, as platform-specific variances may meet this
- * more than one error code
+ * more than one error code
*/
#define APR_STATUS_IS_ENOSTAT(s) ((s) == APR_ENOSTAT)
-/**
- * APR was not provided a pool with which to allocate memory
+/**
+ * APR was not provided a pool with which to allocate memory
* @warning always use this test, as platform-specific variances may meet this
- * more than one error code
+ * more than one error code
*/
#define APR_STATUS_IS_ENOPOOL(s) ((s) == APR_ENOPOOL)
/** APR was given an invalid date */
@@ -390,8 +390,8 @@
/** The specified netmask is invalid */
#define APR_STATUS_IS_EBADMASK(s) ((s) == APR_EBADMASK)
/* empty slot: +18 */
-/**
- * APR was unable to open the dso object.
+/**
+ * APR was unable to open the dso object.
* For more information call apr_dso_error().
*/
#if defined(WIN32)
@@ -428,7 +428,7 @@
/** @} */
-/**
+/**
* @addtogroup APR_Error
* @{
*/
@@ -469,7 +469,7 @@
/** @see APR_STATUS_IS_KEYBASED */
#define APR_KEYBASED (APR_OS_START_STATUS + 21)
/** @see APR_STATUS_IS_EINIT */
-#define APR_EINIT (APR_OS_START_STATUS + 22)
+#define APR_EINIT (APR_OS_START_STATUS + 22)
/** @see APR_STATUS_IS_ENOTIMPL */
#define APR_ENOTIMPL (APR_OS_START_STATUS + 23)
/** @see APR_STATUS_IS_EMISMATCH */
@@ -478,156 +478,156 @@
#define APR_EBUSY (APR_OS_START_STATUS + 25)
/** @} */
-/**
+/**
* @addtogroup APR_STATUS_IS
* @{
*/
-/**
- * Program is currently executing in the child
+/**
+ * Program is currently executing in the child
* @warning
* always use this test, as platform-specific variances may meet this
* more than one error code */
#define APR_STATUS_IS_INCHILD(s) ((s) == APR_INCHILD)
-/**
- * Program is currently executing in the parent
+/**
+ * Program is currently executing in the parent
* @warning
* always use this test, as platform-specific variances may meet this
- * more than one error code
+ * more than one error code
*/
#define APR_STATUS_IS_INPARENT(s) ((s) == APR_INPARENT)
-/**
- * The thread is detached
+/**
+ * The thread is detached
* @warning
* always use this test, as platform-specific variances may meet this
- * more than one error code
+ * more than one error code
*/
#define APR_STATUS_IS_DETACH(s) ((s) == APR_DETACH)
-/**
- * The thread is not detached
+/**
+ * The thread is not detached
* @warning
* always use this test, as platform-specific variances may meet this
- * more than one error code
+ * more than one error code
*/
#define APR_STATUS_IS_NOTDETACH(s) ((s) == APR_NOTDETACH)
-/**
+/**
* The child has finished executing
* @warning
* always use this test, as platform-specific variances may meet this
- * more than one error code
+ * more than one error code
*/
#define APR_STATUS_IS_CHILD_DONE(s) ((s) == APR_CHILD_DONE)
-/**
+/**
* The child has not finished executing
* @warning
* always use this test, as platform-specific variances may meet this
- * more than one error code
+ * more than one error code
*/
#define APR_STATUS_IS_CHILD_NOTDONE(s) ((s) == APR_CHILD_NOTDONE)
-/**
+/**
* The operation did not finish before the timeout
* @warning
* always use this test, as platform-specific variances may meet this
- * more than one error code
+ * more than one error code
*/
#define APR_STATUS_IS_TIMEUP(s) ((s) == APR_TIMEUP)
-/**
+/**
* The operation was incomplete although some processing was performed
* and the results are partially valid.
* @warning
* always use this test, as platform-specific variances may meet this
- * more than one error code
+ * more than one error code
*/
#define APR_STATUS_IS_INCOMPLETE(s) ((s) == APR_INCOMPLETE)
/* empty slot: +9 */
/* empty slot: +10 */
/* empty slot: +11 */
-/**
+/**
* Getopt found an option not in the option string
* @warning
* always use this test, as platform-specific variances may meet this
- * more than one error code
+ * more than one error code
*/
#define APR_STATUS_IS_BADCH(s) ((s) == APR_BADCH)
-/**
- * Getopt found an option not in the option string and an argument was
+/**
+ * Getopt found an option not in the option string and an argument was
* specified in the option string
* @warning
* always use this test, as platform-specific variances may meet this
- * more than one error code
+ * more than one error code
*/
#define APR_STATUS_IS_BADARG(s) ((s) == APR_BADARG)
-/**
+/**
* APR has encountered the end of the file
* @warning
* always use this test, as platform-specific variances may meet this
- * more than one error code
+ * more than one error code
*/
#define APR_STATUS_IS_EOF(s) ((s) == APR_EOF)
-/**
+/**
* APR was unable to find the socket in the poll structure
* @warning
* always use this test, as platform-specific variances may meet this
- * more than one error code
+ * more than one error code
*/
#define APR_STATUS_IS_NOTFOUND(s) ((s) == APR_NOTFOUND)
/* empty slot: +16 */
/* empty slot: +17 */
/* empty slot: +18 */
-/**
+/**
* APR is using anonymous shared memory
* @warning
* always use this test, as platform-specific variances may meet this
- * more than one error code
+ * more than one error code
*/
#define APR_STATUS_IS_ANONYMOUS(s) ((s) == APR_ANONYMOUS)
-/**
+/**
* APR is using a file name as the key to the shared memory
* @warning
* always use this test, as platform-specific variances may meet this
- * more than one error code
+ * more than one error code
*/
#define APR_STATUS_IS_FILEBASED(s) ((s) == APR_FILEBASED)
-/**
+/**
* APR is using a shared key as the key to the shared memory
* @warning
* always use this test, as platform-specific variances may meet this
- * more than one error code
+ * more than one error code
*/
#define APR_STATUS_IS_KEYBASED(s) ((s) == APR_KEYBASED)
-/**
- * Ininitalizer value. If no option has been found, but
+/**
+ * Ininitalizer value. If no option has been found, but
* the status variable requires a value, this should be used
* @warning
* always use this test, as platform-specific variances may meet this
- * more than one error code
+ * more than one error code
*/
#define APR_STATUS_IS_EINIT(s) ((s) == APR_EINIT)
-/**
- * The APR function has not been implemented on this
- * platform, either because nobody has gotten to it yet,
+/**
+ * The APR function has not been implemented on this
+ * platform, either because nobody has gotten to it yet,
* or the function is impossible on this platform.
* @warning
* always use this test, as platform-specific variances may meet this
- * more than one error code
+ * more than one error code
*/
#define APR_STATUS_IS_ENOTIMPL(s) ((s) == APR_ENOTIMPL)
-/**
+/**
* Two passwords do not match.
* @warning
* always use this test, as platform-specific variances may meet this
- * more than one error code
+ * more than one error code
*/
#define APR_STATUS_IS_EMISMATCH(s) ((s) == APR_EMISMATCH)
-/**
+/**
* The given lock was busy
* @warning always use this test, as platform-specific variances may meet this
- * more than one error code
+ * more than one error code
*/
#define APR_STATUS_IS_EBUSY(s) ((s) == APR_EBUSY)
/** @} */
-/**
+/**
* @addtogroup APR_Error APR Error Values
* @{
*/
@@ -716,8 +716,8 @@
#define APR_ESPIPE (APR_OS_START_CANONERR + 12)
#endif
-/**
- * @see APR_STATUS_IS_EAGAIN
+/**
+ * @see APR_STATUS_IS_EAGAIN
* @warning use APR_STATUS_IS_EAGAIN instead of just testing this value
*/
#ifdef EAGAIN
@@ -756,7 +756,7 @@
#define APR_EINPROGRESS (APR_OS_START_CANONERR + 17)
#endif
-/**
+/**
* @see APR_STATUS_IS_ECONNABORTED
* @warning use APR_STATUS_IS_ECONNABORTED instead of just testing this value
*/
@@ -774,7 +774,7 @@
#define APR_ECONNRESET (APR_OS_START_CANONERR + 19)
#endif
-/** @see APR_STATUS_IS_ETIMEDOUT
+/** @see APR_STATUS_IS_ETIMEDOUT
* @deprecated */
#ifdef ETIMEDOUT
#define APR_ETIMEDOUT ETIMEDOUT
@@ -859,7 +859,7 @@
*/
#define APR_OS2_STATUS(e) (APR_FROM_OS_ERROR(e))
-/* These can't sit in a private header, so in spite of the extra size,
+/* These can't sit in a private header, so in spite of the extra size,
* they need to be made available here.
*/
#define SOCBASEERR 10000
@@ -956,10 +956,10 @@
|| (s) == APR_OS_START_SYSERR + SOCECONNRESET)
/* XXX deprecated */
#define APR_STATUS_IS_ETIMEDOUT(s) ((s) == APR_ETIMEDOUT \
- || (s) == APR_OS_START_SYSERR + SOCETIMEDOUT)
+ || (s) == APR_OS_START_SYSERR + SOCETIMEDOUT)
#undef APR_STATUS_IS_TIMEUP
#define APR_STATUS_IS_TIMEUP(s) ((s) == APR_TIMEUP \
- || (s) == APR_OS_START_SYSERR + SOCETIMEDOUT)
+ || (s) == APR_OS_START_SYSERR + SOCETIMEDOUT)
#define APR_STATUS_IS_EHOSTUNREACH(s) ((s) == APR_EHOSTUNREACH \
|| (s) == APR_OS_START_SYSERR + SOCEHOSTUNREACH)
#define APR_STATUS_IS_ENETUNREACH(s) ((s) == APR_ENETUNREACH \
@@ -1198,7 +1198,7 @@
#define apr_get_netos_error() (errno)
#define apr_set_netos_error(e) (errno = (e))
-/**
+/**
* @addtogroup APR_STATUS_IS
* @{
*/
@@ -1262,15 +1262,15 @@
/** operation now in progress */
#define APR_STATUS_IS_EINPROGRESS(s) ((s) == APR_EINPROGRESS)
-/**
- * Software caused connection abort
+/**
+ * Software caused connection abort
* @remark
- * EPROTO on certain older kernels really means ECONNABORTED, so we need to
+ * EPROTO on certain older kernels really means ECONNABORTED, so we need to
* ignore it for them. See discussion in new-httpd archives nh.9701 & nh.9603
*
- * There is potentially a bug in Solaris 2.x x<6, and other boxes that
+ * There is potentially a bug in Solaris 2.x x<6, and other boxes that
* implement tcp sockets in userland (i.e. on top of STREAMS). On these
- * systems, EPROTO can actually result in a fatal loop. See PR#981 for
+ * systems, EPROTO can actually result in a fatal loop. See PR#981 for
* example. It's hard to handle both uses of EPROTO.
*/
#ifdef EPROTO
Author: rpluem
Date: Tue Dec 1 16:06:29 2009
New Revision: 885813
URL: http://svn.apache.org/viewvc?rev=885813&view=rev
Log:
* Silence compiler warning
Modified:
apr/apr/trunk/dbd/apr_dbd_mysql.c
Modified: apr/apr/trunk/dbd/apr_dbd_mysql.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/dbd/apr_dbd_mysql.c?rev=885813&r1=885812&r2=885813&view=diff
==============================================================================
--- apr/apr/trunk/dbd/apr_dbd_mysql.c (original)
+++ apr/apr/trunk/dbd/apr_dbd_mysql.c Tue Dec 1 16:06:29 2009
@@ -1131,7 +1131,9 @@
{NULL, NULL}
};
unsigned int port = 0;
+#if MYSQL_VERSION_ID >= 50013
unsigned int timeout = 0;
+#endif
apr_dbd_t *sql = apr_pcalloc(pool, sizeof(apr_dbd_t));
sql->fldsz = FIELDSIZE;
sql->conn = mysql_init(sql->conn);
Author: brane
Date: Tue Dec 1 09:29:45 2009
New Revision: 885699
URL: http://svn.apache.org/viewvc?rev=885699&view=rev
Log:
Merge r821306 from trunk:
On Windows, map the system error code ERROR DIRECTORY which means
"directory name is not valid" into APR_STATUS_IS_ENOTDIR.
Modified:
apr/apr/branches/1.4.x/ (props changed)
apr/apr/branches/1.4.x/CHANGES
apr/apr/branches/1.4.x/include/apr_errno.h
Propchange: apr/apr/branches/1.4.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 1 09:29:45 2009
@@ -1 +1 @@
-/apr/apr/trunk:733052,747990,748361,748371,748565,748888,748988,749810,782838,783398,783958,784633,784773,788588,793192,794118,794485,795267,799497,800627,809745,809854,810472,811455,813063,829490,831641
+/apr/apr/trunk:733052,747990,748361,748371,748565,748888,748988,749810,782838,783398,783958,784633,784773,788588,793192,794118,794485,795267,799497,800627,809745,809854,810472,811455,813063,821306,829490,831641
Modified: apr/apr/branches/1.4.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/CHANGES?rev=885699&r1=885698&r2=885699&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/CHANGES [utf-8] (original)
+++ apr/apr/branches/1.4.x/CHANGES [utf-8] Tue Dec 1 09:29:45 2009
@@ -34,6 +34,9 @@
*) Add apr_file_link() function. PR 44841. [Mark Heily <mark heily.com>]
+ *) Win32: Properly handle the ERROR_DIRECTORY system error code.
+ [Brane Čibej]
+
Changes for APR 1.3.x and later:
*) http://svn.apache.org/viewvc/apr/apr/branches/1.3.x/CHANGES?view=markup
Modified: apr/apr/branches/1.4.x/include/apr_errno.h
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/include/apr_errno.h?rev=885699&r1=885698&r2=885699&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/include/apr_errno.h (original)
+++ apr/apr/branches/1.4.x/include/apr_errno.h Tue Dec 1 09:29:45 2009
@@ -1046,7 +1046,8 @@
|| (s) == APR_OS_START_SYSERR + ERROR_BAD_NETPATH \
|| (s) == APR_OS_START_SYSERR + ERROR_BAD_NET_NAME \
|| (s) == APR_OS_START_SYSERR + ERROR_BAD_PATHNAME \
- || (s) == APR_OS_START_SYSERR + ERROR_INVALID_DRIVE)
+ || (s) == APR_OS_START_SYSERR + ERROR_INVALID_DRIVE \
+ || (s) == APR_OS_START_SYSERR + ERROR_DIRECTORY)
#define APR_STATUS_IS_ENOSPC(s) ((s) == APR_ENOSPC \
|| (s) == APR_OS_START_SYSERR + ERROR_DISK_FULL)
#define APR_STATUS_IS_ENOMEM(s) ((s) == APR_ENOMEM \
Author: rpluem
Date: Thu Nov 26 21:03:41 2009
New Revision: 884697
URL: http://svn.apache.org/viewvc?rev=884697&view=rev
Log:
* mysql_options() requires a pointer as third argument, not a value.
PR: 48251
Submitted by: Marko Kevac <mkevac gmail.com>
Reviewed by: rpluem
Modified:
apr/apr/trunk/dbd/apr_dbd_mysql.c
Modified: apr/apr/trunk/dbd/apr_dbd_mysql.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/dbd/apr_dbd_mysql.c?rev=884697&r1=884696&r2=884697&view=diff
==============================================================================
--- apr/apr/trunk/dbd/apr_dbd_mysql.c (original)
+++ apr/apr/trunk/dbd/apr_dbd_mysql.c Thu Nov 26 21:03:41 2009
@@ -1131,6 +1131,7 @@
{NULL, NULL}
};
unsigned int port = 0;
+ unsigned int timeout = 0;
apr_dbd_t *sql = apr_pcalloc(pool, sizeof(apr_dbd_t));
sql->fldsz = FIELDSIZE;
sql->conn = mysql_init(sql->conn);
@@ -1184,16 +1185,19 @@
do_reconnect = atoi(fields[9].value) ? 1 : 0;
}
if (fields[10].value != NULL) {
- mysql_options(sql->conn, MYSQL_OPT_CONNECT_TIMEOUT,
- atoi(fields[10].value));
+ timeout = atoi(fields[10].value);
+ mysql_options(sql->conn, MYSQL_OPT_CONNECT_TIMEOUT,
+ (const void *)&timeout);
}
if (fields[11].value != NULL) {
- mysql_options(sql->conn, MYSQL_OPT_READ_TIMEOUT,
- atoi(fields[11].value));
+ timeout = atoi(fields[11].value);
+ mysql_options(sql->conn, MYSQL_OPT_READ_TIMEOUT,
+ (const void *)&timeout);
}
if (fields[12].value != NULL) {
- mysql_options(sql->conn, MYSQL_OPT_WRITE_TIMEOUT,
- atoi(fields[12].value));
+ timeout = atoi(fields[12].value);
+ mysql_options(sql->conn, MYSQL_OPT_WRITE_TIMEOUT,
+ (const void *)&timeout);
}
#endif
Author: pquerna
Date: Wed Nov 25 22:26:22 2009
New Revision: 884305
URL: http://svn.apache.org/viewvc?rev=884305&view=rev
Log:
Create APR-Util tag for httpd 2.3.4-alpha
Added:
apr/apr-util/tags/1.4.x-r884301/ (props changed)
- copied from r884304, apr/apr-util/branches/1.4.x/
Propchange: apr/apr-util/tags/1.4.x-r884301/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Nov 25 22:26:22 2009
@@ -0,0 +1,45 @@
+.libs
+.deps
+Makefile
+aclocal.m4
+config.cache
+config.log
+config.status
+config.nice
+configure
+libtool
+libaprutil*.la
+aprutil.exp
+exports.c
+export_vars.[ch]
+export_vars.sh
+apu-config
+apu-*-config
+apu-config.out
+Debug
+Release
+LibD
+LibR
+aprutil.opt
+aprutil.ncb
+*.
+libaprutil.rc
+*.aps
+*.plg
+*.dep
+*.mak
+*.rc
+BuildLog.htm
+*.stc
+*.stt
+*.sto
+*.vcproj
+*.vcproj.*
+autom4te.cache
+build-outputs.mk
+.make.dirs
+apr-util*.pc
+apr-util.spec
+
+
+
Propchange: apr/apr-util/tags/1.4.x-r884301/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Nov 25 22:26:22 2009
@@ -0,0 +1,2 @@
+/apr/apr/trunk:781403,781409,784519,784592,789965,794508
+/apr/apr-util/trunk:731033-731034,731225,731236,731291,731293,731379,743986,744009,745771,747612,747623,747630
Author: pquerna
Date: Wed Nov 25 22:24:41 2009
New Revision: 884303
URL: http://svn.apache.org/viewvc?rev=884303&view=rev
Log:
create apr-1.4.x tag for httpd 2.3.4-alpha.
Added:
apr/apr/tags/1.4.x-r884301/ (props changed)
- copied from r884301, apr/apr/branches/1.4.x/
Propchange: apr/apr/tags/1.4.x-r884301/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Nov 25 22:24:41 2009
@@ -0,0 +1,52 @@
+Makefile
+config.cache
+config.log
+config.nice
+config.status
+configure
+libtool
+apr-config
+apr-*-config
+apr-config.out
+LibD
+LibNTD
+LibR
+LibNTR
+Debug
+DebugNT
+Release
+ReleaseNT
+*.ncb
+*.opt
+*.plg
+apr.exp
+exports.c
+export_vars.[ch]
+.libs
+.deps
+*.la
+libapr.rc
+*.aps
+*.plg
+*.dep
+*.mak
+*.rc
+BuildLog.htm
+*.stc
+*.stt
+*.sto
+*.vcproj
+*.vcproj.*
+autom4te.cache
+ltcf-c.sh
+build-outputs.mk
+.make.dirs
+*.bb
+*.bbg
+*.da
+coverage
+apr*.pc
+apr.spec
+libtool.exe
+
+
Propchange: apr/apr/tags/1.4.x-r884301/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Nov 25 22:24:41 2009
@@ -0,0 +1 @@
+/apr/apr/trunk:733052,747990,748361,748371,748565,748888,748988,749810,782838,783398,783958,784633,784773,788588,793192,794118,794485,795267,799497,800627,809745,809854,810472,811455,813063,829490,831641
Author: trawick
Date: Wed Nov 25 15:43:01 2009
New Revision: 884153
URL: http://svn.apache.org/viewvc?rev=884153&view=rev
Log:
Merge r884144 from trunk:
Win32 apr_{global,proc}_mutex_name() and apr_{global,proc}_mutex_lockfile()
returned the wrong information
(intentionally omitted from CHANGES; I doubt anybody cares)
Modified:
apr/apr/branches/1.3.x/locks/win32/proc_mutex.c
Modified: apr/apr/branches/1.3.x/locks/win32/proc_mutex.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.3.x/locks/win32/proc_mutex.c?rev=884153&r1=884152&r2=884153&view=diff
==============================================================================
--- apr/apr/branches/1.3.x/locks/win32/proc_mutex.c (original)
+++ apr/apr/branches/1.3.x/locks/win32/proc_mutex.c Wed Nov 25 15:43:01 2009
@@ -186,12 +186,12 @@
APR_DECLARE(const char *) apr_proc_mutex_lockfile(apr_proc_mutex_t *mutex)
{
- return NULL;
+ return mutex->fname;
}
APR_DECLARE(const char *) apr_proc_mutex_name(apr_proc_mutex_t *mutex)
{
- return mutex->fname;
+ return apr_proc_mutex_defname();
}
APR_DECLARE(const char *) apr_proc_mutex_defname(void)
Author: trawick
Date: Wed Nov 25 15:40:24 2009
New Revision: 884152
URL: http://svn.apache.org/viewvc?rev=884152&view=rev
Log:
Merge r884144 from trunk:
Win32 apr_{global,proc}_mutex_name() and apr_{global,proc}_mutex_lockfile()
returned the wrong information
Modified:
apr/apr/branches/1.4.x/locks/win32/proc_mutex.c
Modified: apr/apr/branches/1.4.x/locks/win32/proc_mutex.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/locks/win32/proc_mutex.c?rev=884152&r1=884151&r2=884152&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/locks/win32/proc_mutex.c (original)
+++ apr/apr/branches/1.4.x/locks/win32/proc_mutex.c Wed Nov 25 15:40:24 2009
@@ -186,12 +186,12 @@
APR_DECLARE(const char *) apr_proc_mutex_lockfile(apr_proc_mutex_t *mutex)
{
- return NULL;
+ return mutex->fname;
}
APR_DECLARE(const char *) apr_proc_mutex_name(apr_proc_mutex_t *mutex)
{
- return mutex->fname;
+ return apr_proc_mutex_defname();
}
APR_DECLARE(const char *) apr_proc_mutex_defname(void)
Author: trawick
Date: Wed Nov 25 15:32:14 2009
New Revision: 884144
URL: http://svn.apache.org/viewvc?rev=884144&view=rev
Log:
Win32 apr_{global,proc}_mutex_name() and apr_{global,proc}_mutex_lockfile()
returned the wrong information
Modified:
apr/apr/trunk/locks/win32/proc_mutex.c
Modified: apr/apr/trunk/locks/win32/proc_mutex.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/locks/win32/proc_mutex.c?rev=884144&r1=884143&r2=884144&view=diff
==============================================================================
--- apr/apr/trunk/locks/win32/proc_mutex.c (original)
+++ apr/apr/trunk/locks/win32/proc_mutex.c Wed Nov 25 15:32:14 2009
@@ -186,12 +186,12 @@
APR_DECLARE(const char *) apr_proc_mutex_lockfile(apr_proc_mutex_t *mutex)
{
- return NULL;
+ return mutex->fname;
}
APR_DECLARE(const char *) apr_proc_mutex_name(apr_proc_mutex_t *mutex)
{
- return mutex->fname;
+ return apr_proc_mutex_defname();
}
APR_DECLARE(const char *) apr_proc_mutex_defname(void)
Author: trawick
Date: Wed Nov 25 15:26:25 2009
New Revision: 884141
URL: http://svn.apache.org/viewvc?rev=884141&view=rev
Log:
merge r884139 from trunk:
add apr_global_mutex_name(), for retrieving the name of the mechanism
used by the underlying apr_proc_mutex_t
declare NULL as the result for any future mechanisms that don't have
an underlying apr_proc_mutex_t or equivalent
Modified:
apr/apr/branches/1.4.x/CHANGES
apr/apr/branches/1.4.x/include/apr_global_mutex.h
apr/apr/branches/1.4.x/locks/unix/global_mutex.c
Modified: apr/apr/branches/1.4.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/CHANGES?rev=884141&r1=884140&r2=884141&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/CHANGES [utf-8] (original)
+++ apr/apr/branches/1.4.x/CHANGES [utf-8] Wed Nov 25 15:26:25 2009
@@ -1,8 +1,10 @@
-*- coding: utf-8 -*-
Changes for APR 1.4.0
- *) Add apr_global_mutex_lockfile() for finding the file, if any,
- associated with the mutex. [Jeff Trawick]
+ *) Add apr_global_mutex_lockfile() for retrieving the file, if any,
+ associated with the mutex. Add apr_global_mutex_name() for retrieving
+ the name of the lock mechanism used by the underlying proc mutex.
+ [Jeff Trawick]
*) Add apr_socket_atreadeof to determine whether the receive part of the
socket has been closed by the peer.
Modified: apr/apr/branches/1.4.x/include/apr_global_mutex.h
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/include/apr_global_mutex.h?rev=884141&r1=884140&r2=884141&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/include/apr_global_mutex.h (original)
+++ apr/apr/branches/1.4.x/include/apr_global_mutex.h Wed Nov 25 15:26:25 2009
@@ -127,6 +127,14 @@
APR_DECLARE(const char *) apr_global_mutex_lockfile(apr_global_mutex_t *mutex);
/**
+ * Display the name of the mutex, as it relates to the actual method used
+ * for the underlying apr_proc_mutex_t, if any. NULL is returned if
+ * there is no underlying apr_proc_mutex_t.
+ * @param mutex the name of the mutex
+ */
+APR_DECLARE(const char *) apr_global_mutex_name(apr_global_mutex_t *mutex);
+
+/**
* Get the pool used by this global_mutex.
* @return apr_pool_t the pool
*/
@@ -147,6 +155,7 @@
#define apr_global_mutex_unlock apr_proc_mutex_unlock
#define apr_global_mutex_destroy apr_proc_mutex_destroy
#define apr_global_mutex_lockfile apr_proc_mutex_lockfile
+#define apr_global_mutex_name apr_proc_mutex_name
#define apr_global_mutex_pool_get apr_proc_mutex_pool_get
#endif
Modified: apr/apr/branches/1.4.x/locks/unix/global_mutex.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/locks/unix/global_mutex.c?rev=884141&r1=884140&r2=884141&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/locks/unix/global_mutex.c (original)
+++ apr/apr/branches/1.4.x/locks/unix/global_mutex.c Wed Nov 25 15:26:25 2009
@@ -180,4 +180,9 @@
return apr_proc_mutex_lockfile(mutex->proc_mutex);
}
+APR_DECLARE(const char *) apr_global_mutex_name(apr_global_mutex_t *mutex)
+{
+ return apr_proc_mutex_name(mutex->proc_mutex);
+}
+
APR_POOL_IMPLEMENT_ACCESSOR(global_mutex)
Author: trawick
Date: Wed Nov 25 15:22:59 2009
New Revision: 884139
URL: http://svn.apache.org/viewvc?rev=884139&view=rev
Log:
add apr_global_mutex_name(), for retrieving the name of the mechanism
used by the underlying apr_proc_mutex_t
declare NULL as the result for any future mechanisms that don't have
an underlying apr_proc_mutex_t or equivalent
Modified:
apr/apr/trunk/include/apr_global_mutex.h
apr/apr/trunk/locks/unix/global_mutex.c
Modified: apr/apr/trunk/include/apr_global_mutex.h
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr_global_mutex.h?rev=884139&r1=884138&r2=884139&view=diff
==============================================================================
--- apr/apr/trunk/include/apr_global_mutex.h (original)
+++ apr/apr/trunk/include/apr_global_mutex.h Wed Nov 25 15:22:59 2009
@@ -128,6 +128,14 @@
APR_DECLARE(const char *) apr_global_mutex_lockfile(apr_global_mutex_t *mutex);
/**
+ * Display the name of the mutex, as it relates to the actual method used
+ * for the underlying apr_proc_mutex_t, if any. NULL is returned if
+ * there is no underlying apr_proc_mutex_t.
+ * @param mutex the name of the mutex
+ */
+APR_DECLARE(const char *) apr_global_mutex_name(apr_global_mutex_t *mutex);
+
+/**
* Set mutex permissions.
*/
APR_PERMS_SET_IMPLEMENT(global_mutex);
@@ -153,6 +161,7 @@
#define apr_global_mutex_unlock apr_proc_mutex_unlock
#define apr_global_mutex_destroy apr_proc_mutex_destroy
#define apr_global_mutex_lockfile apr_proc_mutex_lockfile
+#define apr_global_mutex_name apr_proc_mutex_name
#define apr_global_mutex_pool_get apr_proc_mutex_pool_get
#endif
Modified: apr/apr/trunk/locks/unix/global_mutex.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/locks/unix/global_mutex.c?rev=884139&r1=884138&r2=884139&view=diff
==============================================================================
--- apr/apr/trunk/locks/unix/global_mutex.c (original)
+++ apr/apr/trunk/locks/unix/global_mutex.c Wed Nov 25 15:22:59 2009
@@ -180,6 +180,11 @@
return apr_proc_mutex_lockfile(mutex->proc_mutex);
}
+APR_DECLARE(const char *) apr_global_mutex_name(apr_global_mutex_t *mutex)
+{
+ return apr_proc_mutex_name(mutex->proc_mutex);
+}
+
APR_PERMS_SET_IMPLEMENT(global_mutex)
{
apr_status_t rv;
Author: trawick
Date: Sat Nov 21 14:40:20 2009
New Revision: 882916
URL: http://svn.apache.org/viewvc?rev=882916&view=rev
Log:
merge r882915 from trunk:
add missing apr_global_mutex_lockfile(), corresponding to
apr_proc_mutex_lockfile()
Modified:
apr/apr/branches/1.4.x/CHANGES
apr/apr/branches/1.4.x/include/apr_global_mutex.h
apr/apr/branches/1.4.x/locks/unix/global_mutex.c
Modified: apr/apr/branches/1.4.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/CHANGES?rev=882916&r1=882915&r2=882916&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/CHANGES [utf-8] (original)
+++ apr/apr/branches/1.4.x/CHANGES [utf-8] Sat Nov 21 14:40:20 2009
@@ -1,6 +1,9 @@
-*- coding: utf-8 -*-
Changes for APR 1.4.0
+ *) Add apr_global_mutex_lockfile() for finding the file, if any,
+ associated with the mutex. [Jeff Trawick]
+
*) Add apr_socket_atreadeof to determine whether the receive part of the
socket has been closed by the peer.
[Ruediger Pluem, Mladen Turk, Joe Orton]
Modified: apr/apr/branches/1.4.x/include/apr_global_mutex.h
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/include/apr_global_mutex.h?rev=882916&r1=882915&r2=882916&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/include/apr_global_mutex.h (original)
+++ apr/apr/branches/1.4.x/include/apr_global_mutex.h Sat Nov 21 14:40:20 2009
@@ -121,6 +121,12 @@
APR_DECLARE(apr_status_t) apr_global_mutex_destroy(apr_global_mutex_t *mutex);
/**
+ * Return the name of the lockfile for the mutex, or NULL
+ * if the mutex doesn't use a lock file
+ */
+APR_DECLARE(const char *) apr_global_mutex_lockfile(apr_global_mutex_t *mutex);
+
+/**
* Get the pool used by this global_mutex.
* @return apr_pool_t the pool
*/
@@ -140,6 +146,7 @@
#define apr_global_mutex_trylock apr_proc_mutex_trylock
#define apr_global_mutex_unlock apr_proc_mutex_unlock
#define apr_global_mutex_destroy apr_proc_mutex_destroy
+#define apr_global_mutex_lockfile apr_proc_mutex_lockfile
#define apr_global_mutex_pool_get apr_proc_mutex_pool_get
#endif
Modified: apr/apr/branches/1.4.x/locks/unix/global_mutex.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/locks/unix/global_mutex.c?rev=882916&r1=882915&r2=882916&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/locks/unix/global_mutex.c (original)
+++ apr/apr/branches/1.4.x/locks/unix/global_mutex.c Sat Nov 21 14:40:20 2009
@@ -175,4 +175,9 @@
return apr_pool_cleanup_run(mutex->pool, mutex, global_mutex_cleanup);
}
+APR_DECLARE(const char *) apr_global_mutex_lockfile(apr_global_mutex_t *mutex)
+{
+ return apr_proc_mutex_lockfile(mutex->proc_mutex);
+}
+
APR_POOL_IMPLEMENT_ACCESSOR(global_mutex)
Author: trawick
Date: Sat Nov 21 14:37:10 2009
New Revision: 882915
URL: http://svn.apache.org/viewvc?rev=882915&view=rev
Log:
add missing apr_global_mutex_lockfile(), corresponding to
apr_proc_mutex_lockfile()
Modified:
apr/apr/trunk/include/apr_global_mutex.h
apr/apr/trunk/locks/unix/global_mutex.c
Modified: apr/apr/trunk/include/apr_global_mutex.h
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr_global_mutex.h?rev=882915&r1=882914&r2=882915&view=diff
==============================================================================
--- apr/apr/trunk/include/apr_global_mutex.h (original)
+++ apr/apr/trunk/include/apr_global_mutex.h Sat Nov 21 14:37:10 2009
@@ -121,6 +121,13 @@
APR_DECLARE(apr_status_t) apr_global_mutex_destroy(apr_global_mutex_t *mutex);
/**
+ * Return the name of the lockfile for the mutex, or NULL
+ * if the mutex doesn't use a lock file
+ */
+
+APR_DECLARE(const char *) apr_global_mutex_lockfile(apr_global_mutex_t *mutex);
+
+/**
* Set mutex permissions.
*/
APR_PERMS_SET_IMPLEMENT(global_mutex);
@@ -145,6 +152,7 @@
#define apr_global_mutex_trylock apr_proc_mutex_trylock
#define apr_global_mutex_unlock apr_proc_mutex_unlock
#define apr_global_mutex_destroy apr_proc_mutex_destroy
+#define apr_global_mutex_lockfile apr_proc_mutex_lockfile
#define apr_global_mutex_pool_get apr_proc_mutex_pool_get
#endif
Modified: apr/apr/trunk/locks/unix/global_mutex.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/locks/unix/global_mutex.c?rev=882915&r1=882914&r2=882915&view=diff
==============================================================================
--- apr/apr/trunk/locks/unix/global_mutex.c (original)
+++ apr/apr/trunk/locks/unix/global_mutex.c Sat Nov 21 14:37:10 2009
@@ -175,6 +175,11 @@
return apr_pool_cleanup_run(mutex->pool, mutex, global_mutex_cleanup);
}
+APR_DECLARE(const char *) apr_global_mutex_lockfile(apr_global_mutex_t *mutex)
+{
+ return apr_proc_mutex_lockfile(mutex->proc_mutex);
+}
+
APR_PERMS_SET_IMPLEMENT(global_mutex)
{
apr_status_t rv;
Author: niq
Date: Fri Nov 20 17:35:23 2009
New Revision: 882650
URL: http://svn.apache.org/viewvc?rev=882650&view=rev
Log:
Support connecttimeout, readtimeout and writetimeout MySQL options
PR 48251
Submitted by Marko Kevac
Modified:
apr/apr/trunk/CHANGES
apr/apr/trunk/dbd/apr_dbd_mysql.c
Modified: apr/apr/trunk/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr/trunk/CHANGES?rev=882650&r1=882649&r2=882650&view=diff
==============================================================================
--- apr/apr/trunk/CHANGES [utf-8] (original)
+++ apr/apr/trunk/CHANGES [utf-8] Fri Nov 20 17:35:23 2009
@@ -1,6 +1,9 @@
-*- coding: utf-8 -*-
Changes for APR 2.0.0
+ *) Support connecttimeout, readtimeout and writetimeout MySQL options
+ PR 48251 [Marko Kevac <marko kevac.org>]
+
*) Add apr_socket_atreadeof to determine whether the receive part of the
socket has been closed by the peer.
[Ruediger Pluem, Mladen Turk, Joe Orton]
Modified: apr/apr/trunk/dbd/apr_dbd_mysql.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/dbd/apr_dbd_mysql.c?rev=882650&r1=882649&r2=882650&view=diff
==============================================================================
--- apr/apr/trunk/dbd/apr_dbd_mysql.c (original)
+++ apr/apr/trunk/dbd/apr_dbd_mysql.c Fri Nov 20 17:35:23 2009
@@ -1122,7 +1122,12 @@
{"flags", NULL},
{"fldsz", NULL},
{"group", NULL},
+#if MYSQL_VERSION_ID >= 50013
{"reconnect", NULL},
+ {"connecttimeout", NULL},
+ {"readtimeout", NULL},
+ {"writetimeout", NULL},
+#endif
{NULL, NULL}
};
unsigned int port = 0;
@@ -1178,6 +1183,18 @@
if (fields[9].value != NULL) {
do_reconnect = atoi(fields[9].value) ? 1 : 0;
}
+ if (fields[10].value != NULL) {
+ mysql_options(sql->conn, MYSQL_OPT_CONNECT_TIMEOUT,
+ atoi(fields[10].value));
+ }
+ if (fields[11].value != NULL) {
+ mysql_options(sql->conn, MYSQL_OPT_READ_TIMEOUT,
+ atoi(fields[11].value));
+ }
+ if (fields[12].value != NULL) {
+ mysql_options(sql->conn, MYSQL_OPT_WRITE_TIMEOUT,
+ atoi(fields[12].value));
+ }
#endif
#if MYSQL_VERSION_ID >= 50013