Xinchen Hui a76eeea736 Merge branch 'PHP-7.2' ...

* PHP-7.2:
  Happy new year (Update copyright to 2018)

Conflicts:
	ext/phar/LICENSE

2018-01-03 16:02:15 +08:00

..

phar

Fixed Bug #65467

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

tests

Merge branch 'PHP-7.1' into PHP-7.2

2018-01-01 21:07:21 -08:00

build_precommand.php

…

config.m4

fix arg order, CFLAGS is the fifth arg in m4

2014-10-17 16:03:40 +02:00

config.w32

add missing makefile fragment for .w32

2017-07-28 07:26:11 +02:00

CREDITS

…

dirstream.c

year++

2018-01-02 12:57:58 +08:00

dirstream.h

year++

2018-01-02 12:57:58 +08:00

func_interceptors.c

year++

2018-01-02 12:57:58 +08:00

func_interceptors.h

year++

2018-01-02 12:57:58 +08:00

gdbhelp

…

Makefile.frag

Merge branch 'PHP-5.6'

2015-05-21 14:07:14 +02:00

Makefile.frag.w32

Fix path in makefile fragment

2017-10-10 14:32:19 +02:00

makestub.php

ZTS cleanup

2015-03-08 19:25:55 +08:00

phar_internal.h

year++

2018-01-02 12:57:58 +08:00

phar_object.c

year++

2018-01-02 12:57:58 +08:00

phar_path_check.c

year++

2018-01-02 12:57:58 +08:00

phar_path_check.re

year++

2018-01-02 12:57:58 +08:00

phar.1.in

Happy new year (Update copyright to 2018)

2018-01-02 23:42:29 +02:00

phar.c

year++

2018-01-02 12:57:58 +08:00

phar.phar.1.in

Fixed Bug #65142 Missing phar man page

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

pharzip.h

year++

2018-01-02 12:57:58 +08:00

php_phar.h

year++

2018-01-02 12:57:58 +08:00

shortarc.php

Fix bug #74782: remove file name from output to avoid XSS

2018-01-01 19:51:02 -08:00

stream.c

year++

2018-01-02 12:57:58 +08:00

stream.h

year++

2018-01-02 12:57:58 +08:00

stub.h

Merge branch 'master' of git.php.net:/php-src

2018-01-02 13:50:40 +08:00

tar.c

year++

2018-01-02 12:57:58 +08:00

tar.h

year++

2018-01-02 12:57:58 +08:00

util.c

year++

2018-01-02 12:57:58 +08:00

zip.c

year++

2018-01-02 12:57:58 +08:00