Anatol Belski 49de5b7aed Merge branch 'PHP-5.6' ...

* PHP-5.6:
  add include for missing usleep proto
  C89 compat
  Added more useful warning messages
  Changed based on comments and make its behaviour equal to the Windows version
  Fix #53092 - dns_get_record does not return false on dns server failure
  Fix php cli (-S option) inconsistent port parsing

Conflicts:
	main/streams/plain_wrapper.c

2014-12-01 08:32:12 +01:00

..

streams

Merge branch 'PHP-5.6'

2014-12-01 08:32:12 +01: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

s/PHP 5/PHP 7/

2014-09-19 18:33:14 +02:00

fopen_wrappers.c

fix datatype mismatch warnings

2014-10-27 16:38:42 +01:00

fopen_wrappers.h

s/PHP 5/PHP 7/

2014-09-19 18:33:14 +02:00

getopt.c

Merge branch 'PHP-5.6'

2014-10-27 19:10:43 -07:00

internal_functions_nw.c

s/PHP 5/PHP 7/

2014-09-19 18:33:14 +02:00

internal_functions_win32.c

s/PHP 5/PHP 7/

2014-09-19 18:33:14 +02:00

internal_functions.c.in

s/PHP 5/PHP 7/

2014-09-19 18:33:14 +02:00

main.c

typo fixes - https://github.com/vlajos/misspell_fixer

2014-11-19 20:23:00 +00:00

mergesort.c

fix datatype mismatches

2014-10-27 16:38:46 +01:00

network.c

fix datatype mismatch and unused var warning

2014-11-11 20:16:13 +01:00

output.c

Merge branch 'PHP-5.6'

2014-10-30 10:28:05 +01:00

php_compat.h

s/PHP 5/PHP 7/

2014-09-19 18:33:14 +02:00

php_content_types.c

s/PHP 5/PHP 7/

2014-09-19 18:33:14 +02:00

php_content_types.h

s/PHP 5/PHP 7/

2014-09-19 18:33:14 +02:00

php_getopt.h

s/PHP 5/PHP 7/

2014-09-19 18:33:14 +02:00

php_globals.h

s/PHP 5/PHP 7/

2014-09-19 18:33:14 +02:00

php_ini.c

fix datatype mismatches and warns

2014-10-27 16:38:48 +01:00

php_ini.h

s/PHP 5/PHP 7/

2014-09-19 18:33:14 +02:00

php_main.h

Merge branch 'PHP-5.6'

2014-10-29 20:04:56 +01:00

php_memory_streams.h

s/PHP 5/PHP 7/

2014-09-19 18:33:14 +02:00

php_network.h

s/PHP 5/PHP 7/

2014-09-19 18:33:14 +02:00

php_open_temporary_file.c

fix datatype mismatch warns

2014-10-27 16:38:51 +01:00

php_open_temporary_file.h

s/PHP 5/PHP 7/

2014-09-19 18:33:14 +02:00

php_output.h

Merge branch 'PHP-5.6'

2014-10-30 10:28:05 +01:00

php_reentrancy.h

s/PHP 5/PHP 7/

2014-09-19 18:33:14 +02:00

php_scandir.c

fix datatype mismatch

2014-10-28 17:24:50 +01:00

php_scandir.h

s/PHP 5/PHP 7/

2014-09-19 18:33:14 +02:00

php_sprintf.c

s/PHP 5/PHP 7/

2014-09-19 18:33:14 +02:00

php_stdint.h

s/PHP 5/PHP 7/

2014-09-19 18:33:14 +02:00

php_streams.h

Merge branch 'PHP-5.6'

2014-10-15 19:41:27 +02:00

php_syslog.h

s/PHP 5/PHP 7/

2014-09-19 18:33:14 +02:00

php_ticks.c

s/PHP 5/PHP 7/

2014-09-19 18:33:14 +02:00

php_ticks.h

s/PHP 5/PHP 7/

2014-09-19 18:33:14 +02:00

php_variables.c

fix datatype mismatch

2014-10-27 16:38:52 +01:00

php_variables.h

s/PHP 5/PHP 7/

2014-09-19 18:33:14 +02:00

php_version.h

5.5.21 now

2014-11-26 11:31:58 +01:00

php.h

s/PHP 5/PHP 7/

2014-09-19 18:33:14 +02:00

reentrancy.c

s/PHP 5/PHP 7/

2014-09-19 18:33:14 +02:00

rfc1867.c

fix datatype mismatches

2014-10-27 16:38:53 +01:00

rfc1867.h

s/PHP 5/PHP 7/

2014-09-19 18:33:14 +02:00

SAPI.c

fix datatype mismatch warns

2014-10-28 17:24:51 +01:00

SAPI.h

s/PHP 5/PHP 7/

2014-09-19 18:33:14 +02:00

snprintf.c

fix datatype mismatches

2014-11-18 13:19:51 +01:00

snprintf.h

typo fixes - https://github.com/vlajos/misspell_fixer

2014-11-19 20:23:00 +00:00

spprintf.c

fix datatype mismatch warning

2014-10-27 17:04:44 +01:00

spprintf.h

s/PHP 5/PHP 7/

2014-09-19 18:33:14 +02:00

strlcat.c

s/PHP 5/PHP 7/

2014-09-19 18:33:14 +02:00

strlcpy.c

s/PHP 5/PHP 7/

2014-09-19 18:33:14 +02:00

win32_internal_function_disabled.h

s/PHP 5/PHP 7/

2014-09-19 18:33:14 +02:00

win95nt.h

adjust pid_t declaration so it doesn't conflict with apache one

2014-11-07 10:18:09 +01:00