Merge branch 'PHP-5.4' into PHP-5.5

Yasuo Ohgaki · Yasuo Ohgaki · commit b1c0614eccda · 2014-01-30T14:16:05.000+09:00
* PHP-5.4:
  Fixed bug data-&gt;fd not set to -1 for open_basedir failure.
diff --git a/ext/session/mod_files.c b/ext/session/mod_files.c
@@ -145,10 +145,12 @@ static void ps_files_open(ps_files *data, const char *key TSRMLS_DC)
 
 				if (fstat(data->fd, &sbuf)) {
 					close(data->fd);
+					data->fd = -1;
 					return;
 				}
 				if (S_ISLNK(sbuf.st_mode) && php_check_open_basedir(buf TSRMLS_CC)) {
 					close(data->fd);
+					data->fd = -1;
 					return;
 				}
 			}

Original file line number	Diff line number	Diff line change
`@@ -145,10 +145,12 @@ static void ps_files_open(ps_files data, const char key TSRMLS_DC)`
`145`	`145`
`146`	`146`	`if (fstat(data->fd, &sbuf)) {`
`147`	`147`	`close(data->fd);`
	`148`	`+ data->fd = -1;`
`148`	`149`	`return;`
`149`	`150`	`}`
`150`	`151`	`if (S_ISLNK(sbuf.st_mode) && php_check_open_basedir(buf TSRMLS_CC)) {`
`151`	`152`	`close(data->fd);`
	`153`	`+ data->fd = -1;`
`152`	`154`	`return;`
`153`	`155`	`}`
`154`	`156`	`}`