Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  simplify error handling for dirs as magic

ext/fileinfo/libmagic/apprentice.c

@@ -2624,7 +2624,7 @@ apprentice_map(struct magic_set *ms, const char *fn)
 	return to give apprentice_load() a chance. */
 	if (php_stream_stat_path_ex((char *)fn, 0, &st, NULL) == SUCCESS) {
                if (st.sb.st_mode & S_IFDIR) {
-                       goto error;
+                       return NULL;
                }
        }
 #endif