change version, allow BOM in config

microsoftarchive · Nov 1, 2012 · 6887a08 · 6887a08
1 parent b56be08
commit 6887a08
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -34,6 +34,12 @@ msvs/RedisCli/Debug/
 msvs/RedisCli/Release/
 msvs/hiredis/Debug/
 msvs/hiredis/Release/
+msvs/x64/
+msvs/RedisBenchmark/x64/
+msvs/RedisCheckAof/x64/
+msvs/RedisCheckDump/x64/
+msvs/RedisCli/x64/
+msvs/hiredis/x64/
 msvs/ipch
 msvs/RedisServer.opensdf
 
diff --git a/src/config.c b/src/config.c
@@ -48,6 +48,13 @@ void loadServerConfig(char *filename) {
         }
     }
 
+    if (fread(buf, 1, 3, fp) == 3) {
+        /* if BOM for UTF-8 skip over it, else seek to 0 */
+        if (buf[0] != (char)0xEF || buf[1] != (char)0xBB || buf[2] != (char)0xBF) {
+            fseek(fp, 0, SEEK_SET);
+        }
+    }
+
     while(fgets(buf,REDIS_CONFIGLINE_MAX+1,fp) != NULL) {
         sds *argv;
         int argc, j;

diff --git a/src/rdb.c b/src/rdb.c
@@ -288,7 +288,7 @@ int rdbSaveObject(FILE *fp, robj *o) {
 
             ar = (cowListArray *)o->ptr;
             cowUnlock();
-            if ((n = rdbSaveLen(fp,ar->numele)) == -1) return -1;
+            if ((n = rdbSaveLen(fp,(uint32_t)ar->numele)) == -1) return -1;
             nwritten += n;
 
             roListRewind(NULL, ar, &li);
@@ -337,7 +337,7 @@ int rdbSaveObject(FILE *fp, robj *o) {
 
             ar = (cowDictArray *)o->ptr;
             di = roDictGetIterator(NULL, ar);
-            if ((n = rdbSaveLen(fp,ar->numele)) == -1) return -1;
+            if ((n = rdbSaveLen(fp,(uint32_t)ar->numele)) == -1) return -1;
             nwritten += n;
 
             while((de = roDictNext(di)) != NULL) {
@@ -389,7 +389,7 @@ int rdbSaveObject(FILE *fp, robj *o) {
 
             ar = (cowDictZArray *)o->ptr;
             di = roZDictGetIterator(NULL, ar);
-            if ((n = rdbSaveLen(fp,ar->numele)) == -1) return -1;
+            if ((n = rdbSaveLen(fp,(uint32_t)ar->numele)) == -1) return -1;
             nwritten += n;
 
             while((de = roZDictNext(di)) != NULL) {
@@ -445,7 +445,7 @@ int rdbSaveObject(FILE *fp, robj *o) {
 
             ar = (cowDictArray *)o->ptr;
             di = roDictGetIterator(NULL, ar);
-            if ((n = rdbSaveLen(fp,ar->numele)) == -1) return -1;
+            if ((n = rdbSaveLen(fp,(uint32_t)ar->numele)) == -1) return -1;
             nwritten += n;
 
             while((de = roDictNext(di)) != NULL) {

diff --git a/src/version.h b/src/version.h
@@ -1 +1 @@
-#define REDIS_VERSION "2.4.11"
+#define REDIS_VERSION "2.4.11-pre1"