delta/php-git.git/ext/phar, branch php-7.0.0RC4

fix test

2015-09-29T07:11:52+00:00

cutting out the '/' is not critical, but allows to avoid forking

Merge branch 'PHP-5.6' into PHP-7.0

2015-09-29T04:43:16+00:00

* PHP-5.6:
  Better fix for bug #70433

Conflicts:
	ext/phar/dirstream.c
	ext/phar/util.c

Merge branch 'PHP-5.5' into PHP-5.6

2015-09-29T04:42:08+00:00

* PHP-5.5:
  Better fix for bug #70433

Conflicts:
	ext/phar/dirstream.c

Better fix for bug #70433

2015-09-29T04:41:02+00:00

Merge branch 'PHP-5.6' into PHP-7.0

2015-09-29T03:45:02+00:00

* PHP-5.6:
  fix memory leak
  FIx bug #70433 - Uninitialized pointer in phar_make_dirstream when zip entry filename is "/"

Conflicts:
	ext/phar/dirstream.c

Merge branch 'PHP-5.5' into PHP-5.6

2015-09-29T03:44:28+00:00

* PHP-5.5:
  fix memory leak
  FIx bug #70433 - Uninitialized pointer in phar_make_dirstream when zip entry filename is "/"

Conflicts:
	ext/phar/dirstream.c

fix memory leak

2015-09-29T03:43:18+00:00

FIx bug #70433 - Uninitialized pointer in phar_make_dirstream when zip entry filename is "/"

2015-09-29T00:12:35+00:00

Merge branch 'PHP-5.6' into PHP-7.0

2015-09-29T00:00:32+00:00

* PHP-5.6:
  Fix bug #69720: Null pointer dereference in phar_get_fp_offset()

Conflicts:
	ext/phar/util.c

Merge branch 'PHP-5.5' into PHP-5.6

2015-09-28T23:59:46+00:00

* PHP-5.5:
  Fix bug #69720: Null pointer dereference in phar_get_fp_offset()