fix

Author: virco

gitcommit.h

@@ -1,8 +1,8 @@
 #ifndef _GITCOMMIT_H
 #define _GITCOMMIT_H
 
-#define GIT_PREV_COMMIT_ID "68aecf4e16335cf14b50e104f70c958a57cf8329"
-#define GIT_PREV_COMMIT_DATE "2016-12-06 17:10:25 +0200"
-#define GIT_COMMIT_DATE "2016-12-09 18:51:39 +0200"
+#define GIT_PREV_COMMIT_ID "68f262e6efc971219fbe6fe7aac5a27a59e9f129"
+#define GIT_PREV_COMMIT_DATE "2016-12-09 18:51:38 +0200"
+#define GIT_COMMIT_DATE "2016-12-11 16:25:58 +0200"
 
 #endif

ppagecache.c

@@ -3046,8 +3046,8 @@ static void psync_pagecache_modify_to_cache(uint64_t taskid, uint64_t hash, uint
       // we covered full new page and full old page cases, so this interval either ends or starts inside current page
       assert((interval->to>off && interval->to<=off+PSYNC_FS_PAGE_SIZE) || (interval->from>=off && interval->from<off+PSYNC_FS_PAGE_SIZE));
       page=psync_pagecache_get_free_page(1);
-//      pdb=check_page_in_memory_by_hash(oldhash, pageid, page->page, PSYNC_FS_PAGE_SIZE, 0);
-//      if (pdb==-1)
+      pdb=check_page_in_memory_by_hash(oldhash, pageid, page->page, PSYNC_FS_PAGE_SIZE, 0);
+      if (pdb==-1)
         pdb=check_page_in_database_by_hash(oldhash, pageid, page->page, PSYNC_FS_PAGE_SIZE, 0);
       if (pdb==-1){
         psync_pagecache_return_free_page(page);

psettings.h

@@ -117,7 +117,7 @@
 #define PSYNC_LOCALSCAN_RESCAN_NOTIFY_SUPPORTED 3600
 #define PSYNC_MIN_INTERVAL_RECALC_DOWNLOAD      2
 #define PSYNC_MIN_INTERVAL_RECALC_UPLOAD        5
-#define PSYNC_UPLOAD_NOWRITE_TIMER              5
+#define PSYNC_UPLOAD_NOWRITE_TIMER              30
 
 #define PSYNC_APIPOOL_MAXIDLE    24
 #define PSYNC_APIPOOL_MAXACTIVE  36

pssl-mbedtls.h

@@ -1,7 +1,7 @@
 /* Copyright (c) 2015 Anton Titov.
  * Copyright (c) 2015 pCloud Ltd.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *     * Redistributions of source code must retain the above copyright
@@ -12,7 +12,7 @@
  *     * Neither the name of pCloud Ltd nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -140,7 +140,7 @@ static inline void psync_aes256_decode_2blocks_consec(psync_aes256_decoder enc,
   aes_crypt_ecb(enc, AES_DECRYPT, src+PSYNC_AES256_BLOCK_SIZE, dst+PSYNC_AES256_BLOCK_SIZE);
 }
 
-static inline void void psync_aes256_decode_4blocks_consec_xor(psync_aes256_decoder enc, const unsigned char *src, unsigned char *dst, unsigned char *bxor){
+static inline void psync_aes256_decode_4blocks_consec_xor(psync_aes256_decoder enc, const unsigned char *src, unsigned char *dst, unsigned char *bxor){
   unsigned long i;
   aes_crypt_ecb(enc, AES_DECRYPT, src, dst);
   aes_crypt_ecb(enc, AES_DECRYPT, src+PSYNC_AES256_BLOCK_SIZE, dst+PSYNC_AES256_BLOCK_SIZE);
@@ -154,4 +154,4 @@ static inline void void psync_aes256_decode_4blocks_consec_xor(psync_aes256_deco
 
 
 
-#endif
+#endif