From 90255dfc42e65e41496220e8640f3b91353b8e77 Mon Sep 17 00:00:00 2001 From: Pierangelo Masarati Date: Wed, 17 Aug 2005 08:32:47 +0000 Subject: [PATCH] back out fix to ITS#3932 --- libraries/librewrite/rewrite-int.h | 5 +---- libraries/librewrite/rule.c | 17 ----------------- 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/libraries/librewrite/rewrite-int.h b/libraries/librewrite/rewrite-int.h index 4b5a60bee2..fb8dbf6ee4 100644 --- a/libraries/librewrite/rewrite-int.h +++ b/libraries/librewrite/rewrite-int.h @@ -206,10 +206,7 @@ struct rewrite_rule { char *lr_pattern; char *lr_subststring; char *lr_flagstring; -#ifdef USE_REWRITE_LDAP_PVT_THREADS - ldap_pvt_thread_mutex_t lr_mutex; -#endif /* USE_REWRITE_LDAP_PVT_THREADS */ - regex_t lr_regex; + regex_t lr_regex; /* * I was thinking about some kind of per-rule mutex, but there's diff --git a/libraries/librewrite/rule.c b/libraries/librewrite/rule.c index 9be1d844cb..84ff22b417 100644 --- a/libraries/librewrite/rule.c +++ b/libraries/librewrite/rule.c @@ -346,14 +346,6 @@ rewrite_rule_compile( return REWRITE_ERR; } -#ifdef USE_REWRITE_LDAP_PVT_THREADS - if ( ldap_pvt_thread_mutex_init( &rule->lr_mutex ) ) { - regfree( &rule->lr_regex ); - free( rule ); - return REWRITE_ERR; - } -#endif /* USE_REWRITE_LDAP_PVT_THREADS */ - /* * Just to remember them ... */ @@ -427,13 +419,7 @@ recurse:; op->lo_num_passes++; -#ifdef USE_REWRITE_LDAP_PVT_THREADS - ldap_pvt_thread_mutex_lock( &rule->lr_mutex ); -#endif /* USE_REWRITE_LDAP_PVT_THREADS */ rc = regexec( &rule->lr_regex, string, nmatch, match, 0 ); -#ifdef USE_REWRITE_LDAP_PVT_THREADS - ldap_pvt_thread_mutex_unlock( &rule->lr_mutex ); -#endif /* USE_REWRITE_LDAP_PVT_THREADS */ if ( rc != 0 ) { if ( *result == NULL && string != arg ) { free( string ); @@ -503,9 +489,6 @@ rewrite_rule_destroy( } regfree( &rule->lr_regex ); -#ifdef USE_REWRITE_LDAP_PVT_THREADS - ldap_pvt_thread_mutex_destroy( &rule->lr_mutex ); -#endif /* USE_REWRITE_LDAP_PVT_THREADS */ for ( action = rule->lr_action; action; ) { struct rewrite_action *curraction = action; -- 2.39.5