Dmitry Stogov 4c716e8b51 Merge branch 'master' into test ...

* master: (39 commits)
  Add __debugInfo() to UPGRADING.
  fix TS build
  Update NEWS
  Update NEWS
  Update NEWS
  Small tidy ups and raise visibility of GitHub PR process
  Bug #41631: Observe socket read timeouts in SSL streams
  wrap int8_t and int16_t with #ifdef to avoid possible clashes
  - Updated to version 2014.6 (2014f)
  Removed Countable::count() change info from UPGRADE.INTERNALS too
  NEWS and UPGRADING for intdiv()
  Revert "Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option"
  Fixed skip case for intdiv 64-bit test
  Use callback structure
  Add EXPECTF
  Fix handling of multi-result sets with PS...used to clean not only the result set but the whole PS.
  5.5.17 now
  5.4.33-dev now
  Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option
  Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option
  ...

Conflicts:
	ext/fileinfo/libmagic/softmagic.c
	main/streams/xp_socket.c

2014-08-11 11:38:41 +04:00

..

streams

Merge branch 'master' into test

2014-08-11 11:38:41 +04: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

Use better data structures (incomplete)

2014-02-10 10:04:30 +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

- MFH Cleanup exports and allow to overwrite ext registration

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

main.c

Merge branch 'master' into phpng

2014-08-04 13:56:27 +04:00

mergesort.c

- MFH Cleanup exports and allow to overwrite ext registration

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

network.c

Merge branch 'master' into test

2014-08-11 11:38:41 +04:00

output.c

cleanup

2014-08-08 13:47:34 +04: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

Merge mainstream 'master' branch into refactoring

2014-04-26 00:32:51 +04:00

php_ini.c

There should been memory leaks(and don't use pointer cast)

2014-05-08 15:20:13 +08:00

php_ini.h

Bump year

2014-01-03 11:08:10 +08: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

Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option

2014-08-05 22:43:12 -04: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

Fixed invalid pointer usage (tests/output/ob_start_callbacks.phpt)

2014-03-07 16:49:01 +08: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

Bump year

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

php_streams.h

Make stream->context indirect trough zend_resource (stream->ctx->ptr).

2014-08-07 15:55:37 +04: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 'call-frame' into phpng

2014-07-07 16:19:24 +04:00

php_variables.h

fix dll export

2014-04-24 10:51:42 +02:00

php_version.h

5.5.15 now

2014-06-11 10:21:26 +02:00

php.h

Merge branch 'PHP-5.6'

2014-02-13 11:56:54 +09:00

reentrancy.c

Bump year

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

rfc1867.c

Merge branch 'master' into phpng

2014-07-22 15:42:17 +04:00

rfc1867.h

Bump year

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

SAPI.c

Merge branch 'master' into test

2014-07-07 19:21:23 +04:00

SAPI.h

Merge mainstream 'master' branch into refactoring

2014-04-26 00:32:51 +04:00

snprintf.c

update zend_make_printable_zval to take TSRM context

2014-08-11 06:09:46 +01:00

snprintf.h

Bump year

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

spprintf.c

update zend_make_printable_zval to take TSRM context

2014-08-11 06:09:46 +01:00

spprintf.h

Added vstrpprintf strpprintf to avoid duplicate string

2014-05-10 00:21:49 +08: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