Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit950451a

Browse files
committed
Fix Bug: change all dbm variable to apr_dbm in persist_dbm.c
1 parent868fbe0 commit950451a

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

‎apache2/persist_dbm.c‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -757,11 +757,11 @@ static int collection_store_ex(int db_option, modsec_rec *msr, apr_table_t *col)
757757
if (blob==NULL) {
758758
if (apr_dbm!=NULL) {
759759
#ifdefGLOBAL_COLLECTION_LOCK
760-
apr_sdbm_close(dbm);
760+
apr_sdbm_close(apr_dbm);
761761
apr_global_mutex_unlock(msr->modsecurity->dbm_lock);
762762
#else
763-
apr_sdbm_unlock(dbm);
764-
apr_sdbm_close(dbm);
763+
apr_sdbm_unlock(apr_dbm);
764+
apr_sdbm_close(apr_dbm);
765765
#endif
766766
}
767767
return-1;
@@ -836,22 +836,22 @@ static int collection_store_ex(int db_option, modsec_rec *msr, apr_table_t *col)
836836
get_apr_error(msr->mp,rc));
837837
if (apr_dbm!=NULL) {
838838
#ifdefGLOBAL_COLLECTION_LOCK
839-
apr_sdbm_close(dbm);
839+
apr_sdbm_close(apr_dbm);
840840
apr_global_mutex_unlock(msr->modsecurity->dbm_lock);
841841
#else
842-
apr_sdbm_unlock(dbm);
843-
apr_sdbm_close(dbm);
842+
apr_sdbm_unlock(apr_dbm);
843+
apr_sdbm_close(apr_dbm);
844844
#endif
845845
}
846846

847847
return-1;
848848
}
849849
#ifdefGLOBAL_COLLECTION_LOCK
850-
apr_sdbm_close(dbm);
850+
apr_sdbm_close(apr_dbm);
851851
apr_global_mutex_unlock(msr->modsecurity->dbm_lock);
852852
#else
853-
apr_sdbm_unlock(dbm);
854-
apr_sdbm_close(dbm);
853+
apr_sdbm_unlock(apr_dbm);
854+
apr_sdbm_close(apr_dbm);
855855
#endif
856856
}
857857

@@ -955,7 +955,7 @@ static int collections_remove_stale_ex(int db_option, modsec_rec *msr, const cha
955955
keys_arr=apr_array_make(msr->mp,256,sizeof(char*));
956956

957957
#ifndefGLOBAL_COLLECTION_LOCK
958-
rc=apr_sdbm_lock(dbm,APR_FLOCK_SHARED);
958+
rc=apr_sdbm_lock(apr_dbm,APR_FLOCK_SHARED);
959959
if (rc!=APR_SUCCESS) {
960960
msr_log(msr,1,"collections_remove_stale: Failed to lock DBM file \"%s\": %s",log_escape(msr->mp,dbm_filename),
961961
get_apr_error(msr->mp,rc));
@@ -975,7 +975,7 @@ static int collections_remove_stale_ex(int db_option, modsec_rec *msr, const cha
975975
rc=apr_sdbm_nextkey(apr_dbm,&key);
976976
}
977977
#ifndefGLOBAL_COLLECTION_LOCK
978-
apr_sdbm_unlock(dbm);
978+
apr_sdbm_unlock(apr_dbm);
979979
#endif
980980

981981
if (msr->txcfg->debuglog_level >=9) {

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp