Remi Collet 8f0567581e Merge branch 'PHP-5.4' into PHP-5.5 ...

* PHP-5.4:
  Fixed Bug #65142 Missing phar man page
  NEWS
  Fixed Bug #65143 Missing php-cgi man page

2013-07-02 10:47:38 +02:00

..

phar

Merge branch 'PHP-5.3' into PHP-5.4

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

tests

Merge branch 'pull-request/341'

2013-06-10 14:30:59 -07:00

build_precommand.php

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

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

config.m4

Fixed Bug #65142 Missing phar man page

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

config.w32

MFH: Fix conditional

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

CREDITS

…

dirstream.c

bump year

2013-01-06 10:19:09 +08:00

dirstream.h

bump year

2013-01-06 10:19:09 +08:00

func_interceptors.c

Merge branch 'pull-request/341'

2013-06-10 14:30:59 -07:00

func_interceptors.h

bump year

2013-01-06 10:19:09 +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

Merge branch 'PHP-5.3' into PHP-5.4

2013-01-06 10:20:00 +08:00

phar_object.c

Merge branch 'PHP-5.4' into PHP-5.5

2013-05-14 16:46:32 +02:00

phar_path_check.c

Merge branch 'PHP-5.4' into PHP-5.5

2013-01-06 10:23:21 +08:00

phar_path_check.re

bump year

2013-01-06 10:19:09 +08:00

phar.1.in

Fixed Bug #65142 Missing phar man page

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

phar.c

Merge branch 'PHP-5.3' into PHP-5.4

2013-01-06 10:20:00 +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

2013-01-06 10:19:09 +08:00

php_phar.h

bump year

2013-01-06 10:19:09 +08:00

shortarc.php

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

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

stream.c

Merge branch 'PHP-5.3' into PHP-5.4

2013-02-21 15:57:26 +04:00

stream.h

bump year

2013-01-06 10:19:09 +08:00

stub.h

bump year

2013-01-06 10:19:09 +08:00

tar.c

more check for php_stream_fopen_tmpfile failure

2013-05-14 16:45:11 +02:00

tar.h

bump year

2013-01-06 10:19:09 +08:00

TODO

…

util.c

Merge branch 'PHP-5.3' into PHP-5.4

2013-05-14 16:45:56 +02:00

zip.c

other fix for #64214, unmodified file may not have old fp set, causing other possible crashes

2013-05-17 11:45:13 +02:00