Nikita Popov d372b33c9b Merge branch 'PHP-5.3' into PHP-5.4 ...

* PHP-5.3:
  Improve JSON error handling

Conflicts:
	ext/json/tests/bug54058.phpt
	ext/json/tests/bug61537.phpt

2012-06-27 12:28:55 +02:00

..

streams

Merge branch 'PHP-5.3' into PHP-5.4

2012-06-08 01:22:46 -07:00

alloca.c

- Fix outside-source-tree builds. Always include generated header files

2005-01-09 21:05:06 +00:00

build-defs.h.in

Expose PHP_MANDIR

2011-04-18 09:50:32 +00:00

fopen_wrappers.c

- Year++

2012-01-01 13:15:04 +00:00

fopen_wrappers.h

- Year++

2012-01-01 13:15:04 +00:00

getopt.c

- Year++

2012-01-01 13:15:04 +00:00

internal_functions_nw.c

- Year++

2012-01-01 13:15:04 +00:00

internal_functions_win32.c

- Year++

2012-01-01 13:15:04 +00:00

internal_functions.c.in

- MFH Cleanup exports and allow to overwrite ext registration

2008-08-22 12:59:46 +00:00

logos.h

- Year++

2012-01-01 13:15:04 +00:00

main.c

typo fix

2012-06-10 20:38:22 -07:00

mergesort.c

- MFH Cleanup exports and allow to overwrite ext registration

2008-08-22 12:59:46 +00:00

network.c

- Year++

2012-01-01 13:15:04 +00:00

output.c

fix bug #60761 zlib.output_compression fails on refresh

2012-05-15 09:33:47 +02:00

php_compat.h

Fix for bug 60986

2012-02-06 18:11:56 +00:00

php_content_types.c

- Year++

2012-01-01 13:15:04 +00:00

php_content_types.h

- Year++

2012-01-01 13:15:04 +00:00

php_getopt.h

- Year++

2012-01-01 13:15:04 +00:00

php_globals.h

- Year++

2012-01-01 13:15:04 +00:00

php_ini.c

- Year++

2012-01-01 13:15:04 +00:00

php_ini.h

- Year++

2012-01-01 13:15:04 +00:00

php_logos.c

- Year++

2012-01-01 13:15:04 +00:00

php_logos.h

- Year++

2012-01-01 13:15:04 +00:00

php_main.h

- Year++

2012-01-01 13:15:04 +00:00

php_memory_streams.h

- Year++

2012-01-01 13:15:04 +00:00

php_network.h

- Year++

2012-01-01 13:15:04 +00:00

php_open_temporary_file.c

- Year++

2012-01-01 13:15:04 +00:00

php_open_temporary_file.h

- Year++

2012-01-01 13:15:04 +00:00

php_output.h

fix bug #60761 zlib.output_compression fails on refresh

2012-05-15 09:33:47 +02:00

php_reentrancy.h

- Year++

2012-01-01 13:15:04 +00:00

php_scandir.c

- Year++

2012-01-01 13:15:04 +00:00

php_scandir.h

- Year++

2012-01-01 13:15:04 +00:00

php_sprintf.c

- Year++

2012-01-01 13:15:04 +00:00

php_streams.h

- Fixed bug #61253: Wrappers opened with errors concurrency problem

2012-03-08 12:30:59 +00:00

php_syslog.h

- Year++

2012-01-01 13:15:04 +00:00

php_ticks.c

- Year++

2012-01-01 13:15:04 +00:00

php_ticks.h

- Year++

2012-01-01 13:15:04 +00:00

php_variables.c

Fixed bug #61043 (Regression in magic_quotes_gpc fix for CVE-2012-0831)

2012-03-21 08:44:59 +01:00

php_variables.h

- Year++

2012-01-01 13:15:04 +00:00

php_version.h

Merge branch 'PHP-5.3' into PHP-5.4

2012-06-27 12:28:55 +02:00

php.h

Merge fix for bug 61193

2012-03-01 22:34:23 +00:00

reentrancy.c

- Year++

2012-01-01 13:15:04 +00:00

rfc1867.c

- merge fix bug #54374, bug #55500 - filter file names better, no dangling [s, svn revision 321664

2012-03-21 06:58:55 +01:00

rfc1867.h

- Year++

2012-01-01 13:15:04 +00:00

SAPI.c

Merge branch 'PHP-5.3' into PHP-5.4

2012-04-06 21:57:56 +08:00

SAPI.h

Merge branch 'PHP-5.3' into PHP-5.4

2012-03-31 09:34:25 +02:00

snprintf.c

- Year++

2012-01-01 13:15:04 +00:00

snprintf.h

- Year++

2012-01-01 13:15:04 +00:00

spprintf.c

- Year++

2012-01-01 13:15:04 +00:00

spprintf.h

- Year++

2012-01-01 13:15:04 +00:00

strlcat.c

- Year++

2012-01-01 13:15:04 +00:00

strlcpy.c

- Year++

2012-01-01 13:15:04 +00:00

win32_internal_function_disabled.h

- Year++

2012-01-01 13:15:04 +00:00

win95nt.h

- Year++

2012-01-01 13:15:04 +00:00