Merge branch 'L1-Prod' into session_changes

manojampalam · manojampalam · commit 1f3c6ff246ab · 2016-10-18T21:58:02.000-07:00
diff --git a/contrib/win32/win32compat/socketio.c b/contrib/win32/win32compat/socketio.c
@@ -1003,6 +1003,7 @@ w32_gethostname(char *name_utf8, size_t len) {
         //        memcpy(name_utf8, tmp_name_utf8, strlen(tmp_name_utf8) + 1);
         //        free(tmp_name_utf8);
         //        return 0;
+                return gethostname(name_utf8, len);
         }
         else
                 return gethostname(name_utf8, len);

Original file line number	Diff line number	Diff line change
`@@ -1003,6 +1003,7 @@ w32_gethostname(char *name_utf8, size_t len) {`
`1003`	`1003`	`// memcpy(name_utf8, tmp_name_utf8, strlen(tmp_name_utf8) + 1);`
`1004`	`1004`	`// free(tmp_name_utf8);`
`1005`	`1005`	`// return 0;`
	`1006`	`+ return gethostname(name_utf8, len);`
`1006`	`1007`	`}`
`1007`	`1008`	`else`
`1008`	`1009`	`return gethostname(name_utf8, len);`