Attachment #78209 for bug #112506

View | Details | Raw Unified | Return to bug 112506
Collapse All | Expand All

Lines 15-21 Link Here

(-)Makefile (-1 / +1 lines)
15	# APR_UTIL_WITH_LDAP: force dependency on OpenLDAP	15	# APR_UTIL_WITH_LDAP: force dependency on OpenLDAP
16		16
17	PORTNAME= apr	17	PORTNAME= apr
18	PORTVERSION= 1.2.7	18	PORTVERSION= 1.2.8
19	PORTREVISION= 1	19	PORTREVISION= 1
20	CATEGORIES= devel	20	CATEGORIES= devel
21	MASTER_SITES= ${MASTER_SITE_APACHE}	21	MASTER_SITES= ${MASTER_SITE_APACHE}

Lines 1-6 Link Here

(-)distinfo (-6 / +6 lines)
1	MD5 (apr-1.2.7.tar.gz) = aea926cbe588f844ad9e317157d60175	1	MD5 (apr-1.2.8.tar.gz) = 814f19528d9cfc79aef188dd752e04d8
2	SHA256 (apr-1.2.7.tar.gz) = 4bde26d8168216f00e0f652e34e20e527dab38edca6a7c0d85aea542bf0fc5fa	2	SHA256 (apr-1.2.8.tar.gz) = 96e31f0ea2e028f372d5fdbbd4f88f31d59e14eda85cd12153183759f8e221c7
3	SIZE (apr-1.2.7.tar.gz) = 1102370	3	SIZE (apr-1.2.8.tar.gz) = 1107189
4	MD5 (apr-util-1.2.7.tar.gz) = c3702668a640be1695956115857ec22e	4	MD5 (apr-util-1.2.8.tar.gz) = a2e2e54d65e9eae961f7171335cf2550
5	SHA256 (apr-util-1.2.7.tar.gz) = 8cd84eb2031a91572e1be2975f4171730a9be72c4cd88718c4c40ac7dc4fd7d3	5	SHA256 (apr-util-1.2.8.tar.gz) = 6527cb0b3dd619acfca668412e84e52860dfd862054246ca903822d5ea824de6
6	SIZE (apr-util-1.2.7.tar.gz) = 641600	6	SIZE (apr-util-1.2.8.tar.gz) = 646379

Lines 1-5 Link Here

(-)files/patch-apr-util_build_dbm.m4 (-2 / +2 lines)
1	--- apr-util-1.2.7/build/dbm.m4-orig Wed Dec 7 09:02:23 2005	1	--- apr-util-1.2.8/build/dbm.m4-orig Wed Dec 7 09:02:23 2005
2	+++ apr-util-1.2.7/build/dbm.m4 Wed Dec 23 09:07:34 2005	2	+++ apr-util-1.2.8/build/dbm.m4 Wed Dec 23 09:07:34 2005
3	@@ -588,6 +588,8 @@	3	@@ -588,6 +588,8 @@
4	elif test "$withval" = "no"; then	4	elif test "$withval" = "no"; then
5	apu_have_gdbm=0	5	apu_have_gdbm=0

Lines 1-5 Link Here

(-)files/patch-apr-util_configure (-2 / +2 lines)
1	--- apr-util-1.2.7/configure.orig Mon Sep 26 18:28:49 2005	1	--- apr-util-1.2.8/configure.orig Mon Sep 26 18:28:49 2005
2	+++ apr-util-1.2.7/configure Fri Dec 23 15:06:09 2005	2	+++ apr-util-1.2.8/configure Fri Dec 23 15:06:09 2005
3	@@ -13806,6 +13806,8 @@	3	@@ -13806,6 +13806,8 @@
4	elif test "$withval" = "no"; then	4	elif test "$withval" = "no"; then
5	apu_have_gdbm=0	5	apu_have_gdbm=0




--- apr-util-1.2.7/dbd/apr_dbd_sqlite3.c.orig	Wed Mar 15 01:04:54 2006
+++ apr-util-1.2.7/dbd/apr_dbd_sqlite3.c	Mon May 29 09:08:08 2006
@@ -24,6 +24,7 @@
 #include <sqlite3.h>
 
 #include "apr_strings.h"
+#include "apr_thread_mutex.h"
 #include "apr_time.h"
 
 #include "apr_dbd_internal.h"
@@ -39,7 +40,9 @@
 struct apr_dbd_t {
     sqlite3 *conn;
     apr_dbd_transaction_t *trans;
+#if APR_HAS_THREADS
     apr_thread_mutex_t *mutex;
+#endif
     apr_pool_t *pool;
 };
 
@@ -93,11 +96,15 @@
         return sql->trans->errnum;
     }
 
+#if APR_HAS_THREADS
     apr_thread_mutex_lock(sql->mutex);
+#endif
 
     ret = sqlite3_prepare(sql->conn, query, strlen(query), &stmt, &tail);
     if (!dbd_sqlite3_is_success(ret)) {
+#if APR_HAS_THREADS
         apr_thread_mutex_unlock(sql->mutex);
+#endif
         return ret;
     } else {
         int column_count;
@@ -118,7 +125,9 @@
                 if (retry_count++ > MAX_RETRY_COUNT) {
                     ret = SQLITE_ERROR;
                 } else {
+#if APR_HAS_THREADS
                     apr_thread_mutex_unlock(sql->mutex);
+#endif
                     apr_sleep(MAX_RETRY_SLEEP);
                     apr_thread_mutex_lock(sql->mutex);
                 }
@@ -179,7 +188,9 @@
         } while (ret == SQLITE_ROW || ret == SQLITE_BUSY);
     }
     ret = sqlite3_finalize(stmt);
+#if APR_HAS_THREADS
     apr_thread_mutex_unlock(sql->mutex);
+#endif
 
     if (sql->trans) {
         sql->trans->errnum = ret;
@@ -242,7 +253,9 @@
     }
 
     length = strlen(query);
+#if APR_HAS_THREADS
     apr_thread_mutex_lock(sql->mutex);
+#endif
 
     do {
         ret = sqlite3_prepare(sql->conn, query, length, &stmt, &tail);
@@ -260,7 +273,9 @@
     if (dbd_sqlite3_is_success(ret)) {
         ret =  0;
     }
+#if APR_HAS_THREADS
     apr_thread_mutex_unlock(sql->mutex);
+#endif
     if (sql->trans) {
         sql->trans->errnum = ret;
     }
@@ -366,12 +381,14 @@
     sql->conn = conn;
     sql->pool = pool;
     sql->trans = NULL;
+#if APR_HAS_THREADS
     /* Create a mutex */
     res = apr_thread_mutex_create(&sql->mutex, APR_THREAD_MUTEX_DEFAULT,
                                   pool);
     if (res != APR_SUCCESS) {
         return NULL;
     }
+#endif
 
     return sql;
 }
@@ -379,7 +396,9 @@
 static apr_status_t dbd_sqlite3_close(apr_dbd_t *handle)
 {
     sqlite3_close(handle->conn);
+#if APR_HAS_THREADS
     apr_thread_mutex_destroy(handle->mutex);
+#endif
     return APR_SUCCESS;
 }
 

Lines 1-5 Link Here

(-)files/patch-apr_hints.m4 (-2 / +2 lines)
1	--- apr-1.2.7/build/apr_hints.m4.orig Wed Oct 27 11:12:28 2004	1	--- apr-1.2.8/build/apr_hints.m4.orig Wed Oct 27 11:12:28 2004
2	+++ apr-1.2.7/build/apr_hints.m4 Wed Oct 27 11:25:32 2004	2	+++ apr-1.2.8/build/apr_hints.m4 Wed Oct 27 11:25:32 2004
3	@@ -137,11 +137,7 @@	3	@@ -137,11 +137,7 @@
4	;;	4	;;
5	-freebsd)	5	-freebsd)

Return to bug 112506

Removed Link Here

(-)files/patch-apr_dbd_sqlite3.c (-101 lines)
1	--- apr-util-1.2.7/dbd/apr_dbd_sqlite3.c.orig Wed Mar 15 01:04:54 2006
2	+++ apr-util-1.2.7/dbd/apr_dbd_sqlite3.c Mon May 29 09:08:08 2006
3	@@ -24,6 +24,7 @@
4	#include <sqlite3.h>
5
6	#include "apr_strings.h"
7	+#include "apr_thread_mutex.h"
8	#include "apr_time.h"
9
10	#include "apr_dbd_internal.h"
11	@@ -39,7 +40,9 @@
12	struct apr_dbd_t {
13	sqlite3 *conn;
14	apr_dbd_transaction_t *trans;
15	+#if APR_HAS_THREADS
16	apr_thread_mutex_t *mutex;
17	+#endif
18	apr_pool_t *pool;
19	};
20
21	@@ -93,11 +96,15 @@
22	return sql->trans->errnum;
23	}
24
25	+#if APR_HAS_THREADS
26	apr_thread_mutex_lock(sql->mutex);
27	+#endif
28
29	ret = sqlite3_prepare(sql->conn, query, strlen(query), &stmt, &tail);
30	if (!dbd_sqlite3_is_success(ret)) {
31	+#if APR_HAS_THREADS
32	apr_thread_mutex_unlock(sql->mutex);
33	+#endif
34	return ret;
35	} else {
36	int column_count;
37	@@ -118,7 +125,9 @@
38	if (retry_count++ > MAX_RETRY_COUNT) {
39	ret = SQLITE_ERROR;
40	} else {
41	+#if APR_HAS_THREADS
42	apr_thread_mutex_unlock(sql->mutex);
43	+#endif
44	apr_sleep(MAX_RETRY_SLEEP);
45	apr_thread_mutex_lock(sql->mutex);
46	}
47	@@ -179,7 +188,9 @@
48	} while (ret == SQLITE_ROW \|\| ret == SQLITE_BUSY);
49	}
50	ret = sqlite3_finalize(stmt);
51	+#if APR_HAS_THREADS
52	apr_thread_mutex_unlock(sql->mutex);
53	+#endif
54
55	if (sql->trans) {
56	sql->trans->errnum = ret;
57	@@ -242,7 +253,9 @@
58	}
59
60	length = strlen(query);
61	+#if APR_HAS_THREADS
62	apr_thread_mutex_lock(sql->mutex);
63	+#endif
64
65	do {
66	ret = sqlite3_prepare(sql->conn, query, length, &stmt, &tail);
67	@@ -260,7 +273,9 @@
68	if (dbd_sqlite3_is_success(ret)) {
69	ret = 0;
70	}
71	+#if APR_HAS_THREADS
72	apr_thread_mutex_unlock(sql->mutex);
73	+#endif
74	if (sql->trans) {
75	sql->trans->errnum = ret;
76	}
77	@@ -366,12 +381,14 @@
78	sql->conn = conn;
79	sql->pool = pool;
80	sql->trans = NULL;
81	+#if APR_HAS_THREADS
82	/* Create a mutex */
83	res = apr_thread_mutex_create(&sql->mutex, APR_THREAD_MUTEX_DEFAULT,
84	pool);
85	if (res != APR_SUCCESS) {
86	return NULL;
87	}
88	+#endif
89
90	return sql;
91	}
92	@@ -379,7 +396,9 @@
93	static apr_status_t dbd_sqlite3_close(apr_dbd_t *handle)
94	{
95	sqlite3_close(handle->conn);
96	+#if APR_HAS_THREADS
97	apr_thread_mutex_destroy(handle->mutex);
98	+#endif
99	return APR_SUCCESS;
100	}
101