php-5.3.7-bug-52935.patch

   1 --- PHP_5_3/main/streams/streams.c      2011/07/05 14:12:01     312936
   2 +++ PHP_5_3/main/streams/streams.c      2011/07/05 16:09:06     312937
   3 @@ -154,6 +154,7 @@
   4         char *tmp = estrdup(path);
   5         char *msg;
   6         int free_msg = 0;
   7 +       php_stream_wrapper orig_wrapper;
   8
   9         if (wrapper) {
  10                 if (wrapper->err_count > 0) {
  11 @@ -198,7 +199,16 @@
  12         }
  13
  14         php_strip_url_passwd(tmp);
  15 +       if (wrapper) {
  16 +               /* see bug #52935 */
  17 +               orig_wrapper = *wrapper;
  18 +               wrapper->err_stack = NULL;
  19 +               wrapper->err_count = 0;
  20 +       }
  21         php_error_docref1(NULL TSRMLS_CC, tmp, E_WARNING, "%s: %s", caption, msg);
  22 +       if (wrapper) {
  23 +               *wrapper = orig_wrapper;
  24 +       }
  25         efree(tmp);
  26         if (free_msg) {
  27                 efree(msg);