Stanislav Malyshev aca526a13b Merge branch 'PHP-5.4' into PHP-5.5 ...

* PHP-5.4:
  Fix accepting ill-formed UTF-8 characters

Conflicts:
	ext/phar/phar_path_check.c

2014-04-22 16:57:17 -07:00

..

phar

Merge branch 'PHP-5.3' into PHP-5.4

2012-10-10 10:45:07 +08:00

tests

Merge branch 'PHP-5.4' into PHP-5.5

2014-04-22 16:57:17 -07: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

Bump year

2014-01-03 11:06:16 +08:00

dirstream.h

Bump year

2014-01-03 11:06:16 +08:00

func_interceptors.c

Bump year

2014-01-03 11:06:16 +08:00

func_interceptors.h

Bump year

2014-01-03 11:06:16 +08:00

gdbhelp

…

LICENSE

…

Makefile.frag

Merge branch 'PHP-5.4' into PHP-5.5

2013-07-02 10:47:38 +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

Bump year

2014-01-03 11:06:16 +08:00

phar_object.c

Bump year

2014-01-03 11:06:16 +08:00

phar_path_check.c

Merge branch 'PHP-5.4' into PHP-5.5

2014-04-22 16:57:17 -07:00

phar_path_check.re

Fix accepting ill-formed UTF-8 characters

2014-04-22 16:55:58 -07:00

phar.1.in

Bump year

2014-01-03 11:06:16 +08:00

phar.c

Bump year

2014-01-03 11:06:16 +08:00

phar.phar.1.in

Fixed Bug #65142 Missing phar man page

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

pharzip.h

Bump year

2014-01-03 11:06:16 +08:00

php_phar.h

Bump year

2014-01-03 11:06:16 +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

2014-01-03 11:06:16 +08:00

stream.h

Bump year

2014-01-03 11:06:16 +08:00

stub.h

Bump year

2014-01-03 11:06:16 +08:00

tar.c

Bump year

2014-01-03 11:06:16 +08:00

tar.h

Bump year

2014-01-03 11:06:16 +08:00

TODO

…

util.c

Bump year

2014-01-03 11:06:16 +08:00

zip.c

Bump year

2014-01-03 11:06:16 +08:00