Merge branch 'master' into SslWebAdmin

.gitmodules

@@ -9,4 +9,4 @@
 	url = https://github.com/bearbin/transapi.git
 [submodule "lib/polarssl"]
 	path = lib/polarssl
-	url = https://github.com/polarssl/polarssl
+	url = https://github.com/mc-server/polarssl

lib/polarssl

@@ -1 +1 @@
-Subproject commit 2cb1a0c4009ecf368ecc74eb428394e10f9e6d00
+Subproject commit 1ed82759c68f92c4acc7e3f33b850cf9f01c8aba

src/Globals.h

@@ -272,7 +272,7 @@ template class SizeChecker<UInt16, 2>;
 #if (defined(_MSC_VER) && (_MSC_VER < 1600))
 	// MSVC before 2010 doesn't have std::shared_ptr, but has std::tr1::shared_ptr, defined in <memory> included earlier
 	#define SharedPtr std::tr1::shared_ptr
-#elif (__cplusplus >= 201103L)
+#elif (defined(_MSC_VER) || (__cplusplus >= 201103L))
 	// C++11 has std::shared_ptr in <memory>, included earlier
 	#define SharedPtr std::shared_ptr
 #else

src/Item.h

@@ -73,6 +73,10 @@ public:
 	}
 	
 	
+	// The constructor is disabled in code, because the compiler generates it anyway,
+	// but it needs to stay because ToLua needs to generate the binding for it
+	#if 0
+	
 	/** Creates an exact copy of the item */
 	cItem(const cItem & a_CopyFrom) :
 		m_ItemType    (a_CopyFrom.m_ItemType),
@@ -85,6 +89,8 @@ public:
 	{
 	}
 	
+	#endif
+	
 	
 	void Empty(void)
 	{

src/WorldStorage/WSSAnvil.cpp

@@ -2672,6 +2672,11 @@ bool cWSSAnvil::cMCAFile::SetChunkData(const cChunkCoords & a_Chunk, const AStri
 		return false;
 	}
 	
+	// Add padding to 4K boundary:
+	size_t BytesWritten = a_Data.size() + MCA_CHUNK_HEADER_LENGTH;
+	static const char Padding[4095] = {0};
+	m_File.Write(Padding, 4096 - (BytesWritten % 4096));
+	
 	// Store the header:
 	ChunkSize = (a_Data.size() + MCA_CHUNK_HEADER_LENGTH + 4095) / 4096;  // Round data size *up* to nearest 4KB sector, make it a sector number
 	ASSERT(ChunkSize < 256);