Julien Pauli 0fd71d1184 Merge branch 'PHP-5.5' into PHP-5.6 ...

* PHP-5.5:
  Fixed test
  5.5.31 now

Conflicts:
	configure.in
	main/php_version.h

2015-09-30 13:19:18 +02:00

..

phar

Fixed Bug #65467

2015-03-30 15:39:30 +02:00

tests

Merge branch 'PHP-5.5' into PHP-5.6

2015-09-30 13:19:18 +02:00

build_precommand.php

- ws/cs, macros, code that only affects other branches

2008-08-01 13:48:45 +00:00

config.m4

Add ability of alias resolving (it cause problem while work with opcache)

2013-10-17 12:23:09 +08:00

config.w32

MFH: Fix conditional

2009-05-11 06:43:05 +00:00

CREDITS

…

dirstream.c

Merge branch 'PHP-5.5' into PHP-5.6

2015-09-28 21:42:08 -07:00

dirstream.h

bump year

2015-01-15 23:26:37 +08:00

func_interceptors.c

bump year

2015-01-15 23:26:37 +08:00

func_interceptors.h

bump year

2015-01-15 23:26:37 +08:00

gdbhelp

…

LICENSE

…

Makefile.frag

Make the phar symlink relative

2015-05-21 14:03:18 +02:00

makestub.php

- ws/cs, macros, code that only affects other branches

2008-08-01 13:48:45 +00:00

package.xml

Remove outdated and user-specific files

2012-06-20 19:46:32 +02:00

phar_internal.h

Merge branch 'PHP-5.5' into PHP-5.6

2015-08-04 15:29:13 -07:00

phar_object.c

virtual_file_ex uses emalloc in 5.6+

2015-08-04 16:31:57 -07:00

phar_path_check.c

bump year

2015-01-15 23:26:37 +08:00

phar_path_check.re

bump year

2015-01-15 23:26:37 +08:00

phar.1.in

Bump year

2014-01-03 11:08:10 +08:00

phar.c

Merge branch 'PHP-5.5' into PHP-5.6

2015-07-07 10:12:51 -07:00

phar.phar.1.in

Fixed Bug #65142 Missing phar man page

2013-07-02 10:46:50 +02:00

pharzip.h

bump year

2015-01-15 23:26:37 +08:00

php_phar.h

bump year

2015-01-15 23:26:37 +08:00

shortarc.php

- ws/cs, macros, code that only affects other branches

2008-08-01 13:48:45 +00:00

stream.c

bump year

2015-01-15 23:26:37 +08:00

stream.h

bump year

2015-01-15 23:26:37 +08:00

stub.h

bump year

2015-01-15 23:26:37 +08:00

tar.c

Merge branch 'PHP-5.5' into PHP-5.6

2015-05-12 14:26:06 -07:00

tar.h

bump year

2015-01-15 23:26:37 +08:00

TODO

…

util.c

Merge branch 'PHP-5.5' into PHP-5.6

2015-09-28 21:42:08 -07:00

zip.c

Merge branch 'PHP-5.5' into PHP-5.6

2015-09-28 21:42:08 -07:00