updating nginx to mainline, logformat fix