Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  - fix test for 5.11
  Fix bug #61504, potential vuln. in fileinfo. update to 5.11

diff --cc ext/fileinfo/libmagic/print.c
index 6d7945a04d85471a8a5d99721819d1d49be14681,ef626708ddfbf611d8b9b02e881c2b346fa52f4b..8370f50c283f8668a535285fcf7280d2265a9ee0
--- 1/ext/fileinfo/libmagic/print.c
--- 2/ext/fileinfo/libmagic/print.c
+++ b/ext/fileinfo/libmagic/print.c
@@@ -35,10 -35,9 +35,10 @@@
  #include "file.h"
  
  #ifndef lint
- FILE_RCSID("@(#)$File: print.c,v 1.66 2009/02/03 20:27:51 christos Exp $")
+ FILE_RCSID("@(#)$File: print.c,v 1.71 2011/09/20 15:28:09 christos Exp $")
  #endif  /* lint */
  
 +#include <stdio.h>
  #include <string.h>
  #include <stdarg.h>
  #include <stdlib.h>