Anatol Belski 0292c34b05 Merge branch 'PHP-5.6' ...

* PHP-5.6:
  reflect in the test that GSS-Negotiate is deprecated since libcurl 7.38.0
  5.6.2 now

Conflicts:
	configure.in
	main/php_version.h

2014-09-11 23:33:12 +02:00

..

streams

first show to make 's' work with size_t

2014-08-27 20:49:31 +02:00

alloca.c

…

build-defs.h.in

Expose PHP_MANDIR

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

fopen_wrappers.c

Refactored INI subsystem to use zend_string* instead of char*

2014-09-01 20:57:33 +04:00

fopen_wrappers.h

Bump year

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

getopt.c

Fixed compilaation warnings

2014-04-22 18:52:59 +04:00

internal_functions_nw.c

Bump year

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

internal_functions_win32.c

Bump year

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

internal_functions.c.in

…

main.c

Fix a number of format issues

2014-09-03 15:57:28 +02:00

mergesort.c

…

network.c

master renames phase 1

2014-08-25 19:24:55 +02:00

output.c

first show to make 's' work with size_t

2014-08-27 20:49:31 +02:00

php_compat.h

Bump year

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

php_content_types.c

fix length overflow of HTTP_RAW_POST_DATA

2014-07-03 20:40:40 +02:00

php_content_types.h

Bump year

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

php_getopt.h

Bump year

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

php_globals.h

master renames phase 1

2014-08-25 19:24:55 +02:00

php_ini.c

restore the length var and fix the com_dotnet ini

2014-09-01 20:34:33 +02:00

php_ini.h

Refactored INI subsystem to use zend_string* instead of char*

2014-09-01 20:57:33 +04:00

php_main.h

Use better data structures (incomplete)

2014-02-10 10:04:30 +04:00

php_memory_streams.h

restore API compatibility

2014-07-03 20:40:41 +02:00

php_network.h

master renames phase 1

2014-08-25 19:24:55 +02:00

php_open_temporary_file.c

Bump year

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

php_open_temporary_file.h

Bump year

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

php_output.h

cleanup

2014-08-13 16:55:21 +04:00

php_reentrancy.h

Bump year

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

php_scandir.c

Bump year

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

php_scandir.h

Bump year

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

php_sprintf.c

Bump year

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

php_stdint.h

generalize the zend_long stuff

2014-08-25 23:52:39 +02:00

php_streams.h

Revert "remove a few gcc format attributes from some printf-like functions"

2014-09-03 15:22:08 +02:00

php_syslog.h

Bump year

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

php_ticks.c

Merge branch 'PHP-5.6'

2014-01-03 11:09:07 +08:00

php_ticks.h

Merge branch 'PHP-5.6'

2014-01-03 11:09:07 +08:00

php_variables.c

Merge branch 'PHP-5.6'

2014-09-09 06:56:33 +02:00

php_variables.h

master renames phase 3

2014-08-25 20:22:49 +02:00

php_version.h

Merge branch 'PHP-5.6'

2014-09-11 23:33:12 +02:00

php.h

Revert "remove a few gcc format attributes from some printf-like functions"

2014-09-03 15:22:08 +02:00

reentrancy.c

Bump year

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

rfc1867.c

master renames phase 3

2014-08-25 20:22:49 +02:00

rfc1867.h

first shot on merging the core fro the int64 branch

2014-08-16 11:16:11 +02:00

SAPI.c

Refactored INI subsystem to use zend_string* instead of char*

2014-09-01 20:57:33 +04:00

SAPI.h

Fixed incompatible pointer type (int64)

2014-08-26 12:11:28 +08:00

snprintf.c

master renames phase 3

2014-08-25 20:22:49 +02:00

snprintf.h

Revert "remove a few gcc format attributes from some printf-like functions"

2014-09-03 15:22:08 +02:00

spprintf.c

master renames phase 3

2014-08-25 20:22:49 +02:00

spprintf.h

Revert "remove a few gcc format attributes from some printf-like functions"

2014-09-03 15:22:08 +02:00

strlcat.c

Bump year

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

strlcpy.c

Bump year

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

win32_internal_function_disabled.h

Bump year

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

win95nt.h

Bump year

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