Merge branch 'PHP-5.6'

dstogov · dstogov · commit bf7d3e0c23d6 · 2015-04-08T15:54:47.000+03:00
* PHP-5.6:
  Fixed typo
diff --git a/ext/dba/dba.c b/ext/dba/dba.c
@@ -921,7 +921,7 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, int persistent)
 				RETURN_FALSE;
 #ifdef F_SETFL
 			} else if (modenr == DBA_CREAT) {
-				int flags = fcntl(info->fd, F_SETFL);
+				int flags = fcntl(info->fd, F_GETFL);
 				fcntl(info->fd, F_SETFL, flags & ~O_APPEND);
 #endif
 			}

Original file line number	Diff line number	Diff line change
`@@ -921,7 +921,7 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, int persistent)`
`921`	`921`	`RETURN_FALSE;`
`922`	`922`	`#ifdef F_SETFL`
`923`	`923`	`} else if (modenr == DBA_CREAT) {`
`924`		`- int flags = fcntl(info->fd, F_SETFL);`
	`924`	`+ int flags = fcntl(info->fd, F_GETFL);`
`925`	`925`	`fcntl(info->fd, F_SETFL, flags & ~O_APPEND);`
`926`	`926`	`#endif`
`927`	`927`	`}`