[dovecot-cvs] dovecot/src/lib-storage/index index-search.c, 1.126, 1.127

[tss at dovecot.org]

Update of /var/lib/cvs/dovecot/src/lib-storage/index
In directory talvi:/tmp/cvs-serv3509

Modified Files:
	index-search.c 
Log Message:
Don't handle TEXT searches in header searches. It's done later anyway.



Index: index-search.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/index-search.c,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -d -r1.126 -r1.127
--- index-search.c	3 Apr 2007 15:02:37 -0000	1.126
+++ index-search.c	3 Apr 2007 17:02:59 -0000	1.127
@@ -413,10 +413,6 @@
 
 		if (strcasecmp(ctx->hdr->name, arg->hdr_field_name) != 0)
 			return;
-	case SEARCH_TEXT:
-		/* TEXT goes through all headers */
-		ctx->custom_header = TRUE;
-		break;
 	default:
 		return;
 	}
@@ -461,7 +457,8 @@
 	}
 
 	if (ret == 1 ||
-	    (arg->type != SEARCH_TEXT && arg->type != SEARCH_HEADER)) {
+	    (arg->type != SEARCH_HEADER &&
+	     arg->type != SEARCH_HEADER_ADDRESS)) {
 		/* set only when we definitely know if it's a match */
 		ARG_SET_RESULT(arg, ret);
 	}