cherokee at cherokee-project
Nov 4, 2009, 5:05 PM
Post #1 of 1
(36 views)
Permalink
|
|
[3777] cherokee/trunk: Fixes an issue with our AVL tree implementation.
|
|
Revision: 3777
http://svn.cherokee-project.com/changeset/3777
Author: alo
Date: 2009-11-05 02:05:51 +0100 (Thu, 05 Nov 2009)
Log Message:
-----------
Fixes an issue with our AVL tree implementation. This bug was causing
problems in the I/O-cache subsystem. This change should fix the bug
#625: http://bugs.cherokee-project.com/625
Modified Paths:
--------------
cherokee/trunk/cherokee/avl.c
cherokee/trunk/cherokee/icons.c
cherokee/trunk/cherokee.conf.sample.pre
Modified: cherokee/trunk/cherokee/avl.c
===================================================================
--- cherokee/trunk/cherokee/avl.c 2009-11-04 23:11:35 UTC (rev 3776)
+++ cherokee/trunk/cherokee/avl.c 2009-11-05 01:05:51 UTC (rev 3777)
@@ -133,10 +133,11 @@
cherokee_buffer_t *B,
cherokee_boolean_t case_insensitive)
{
- if (case_insensitive)
+ if (case_insensitive) {
+ return cherokee_buffer_case_cmp_buf (A, B);
+ } else {
return cherokee_buffer_cmp_buf (A, B);
- else
- return cherokee_buffer_case_cmp_buf (A, B);
+ }
}
Modified: cherokee/trunk/cherokee/icons.c
===================================================================
--- cherokee/trunk/cherokee/icons.c 2009-11-04 23:11:35 UTC (rev 3776)
+++ cherokee/trunk/cherokee/icons.c 2009-11-05 01:05:51 UTC (rev 3777)
@@ -180,8 +180,11 @@
ret = cherokee_avl_add (&icons->suffixes, suffix, tmp);
if (unlikely (ret != ret_ok)) {
+ LOG_ERROR ("Duped suffix (case insensitive) '%s', pointing to '%s'\n",
+ suffix->buf, tmp->buf);
+
cherokee_buffer_free (tmp);
- return ret;
+ return ret_ok;
}
return ret_ok;
Modified: cherokee/trunk/cherokee.conf.sample.pre
===================================================================
--- cherokee/trunk/cherokee.conf.sample.pre 2009-11-04 23:11:35 UTC (rev 3776)
+++ cherokee/trunk/cherokee.conf.sample.pre 2009-11-05 01:05:51 UTC (rev 3777)
@@ -75,7 +75,7 @@
icons!suffix!page_white_text.png = txt,text,rtf,sdw
icons!suffix!font.png = ttf
icons!suffix!music.png = au,snd,mid,midi,kar,mpga,mpega,mp2,mp3,sid,wav,aif,aiff,aifc,gsm,m3u,wma,wax,ra,rm,ram,pls,sd2,ogg
-icons!suffix!package.png = tar,gz,bz2,zip,rar,ace,lha,Z,z,7z
+icons!suffix!package.png = tar,gz,bz2,zip,rar,ace,lha,Z,7z
icons!suffix!film.png = avi,mpeg,mpe,mpg,mpeg3,dl,fli,qt,mov,movie,flv
icons!suffix!cup.png = java,class,jar
icons!suffix!cd.png = iso,ngr,cue
|
