Xinchen Hui ce6ad9bdd9 Merge branch 'PHP-7.0' into PHP-7.1 ...

* PHP-7.0: (48 commits)
  Update NEWs
  Unused label
  Fixed bug #72853 (stream_set_blocking doesn't work)
  fix test
  Bug #72663 - part 3
  Bug #72663 - part 2
  Bug #72663 - part 1
  Update NEWS
  BLock test with memory leak
  fix tests
  Fix TSRM build
  Fix bug #72850 - integer overflow in uuencode
  Fixed bug #72849 - integer overflow in urlencode
  Fix bug #72848 - integer overflow in quoted_printable_encode caused heap corruption
  Fix bug #72838 - 	Integer overflow lead to heap corruption in sql_regcase
  Fix bug #72837 - integer overflow in bzdecompress caused heap corruption
  Fix bug #72836 - integer overflow in base64_decode caused heap corruption
  Fix for bug #72807 - do not produce strings with negative length
  Fix for bug #72790 and bug #72799
  Fix bug #72730 - imagegammacorrect allows arbitrary write access
  ...

Conflicts:
	ext/standard/var_unserializer.c

2016-08-17 17:14:30 +08:00

..

streams

Merge branch 'PHP-7.0' into PHP-7.1

2016-08-17 17:14:30 +08:00

alloca.c

…

build-defs.h.in

Merge branch 'PHP-5.6' into PHP-7.0

2016-01-04 18:13:38 +01:00

fastcgi.c

Fixed compilation warnings

2016-06-28 11:37:51 +03:00

fastcgi.h

Fixed compilation warnings

2016-06-21 17:56:07 +03:00

fopen_wrappers.c

Use size_t for path length

2016-08-10 23:46:58 -07:00

fopen_wrappers.h

Remove version checks

2016-01-30 15:35:28 +01:00

getopt.c

Fixed compilation warnings

2016-06-21 20:12:29 +03:00

http_status_codes.h

Happy new year (Update copyright to 2016)

2016-01-01 20:03:16 +02:00

internal_functions_nw.c

Merge branch 'PHP-5.6' into PHP-7.0

2016-01-01 19:48:25 +02:00

internal_functions_win32.c

Merge branch 'PHP-5.6' into PHP-7.0

2016-01-01 19:48:25 +02:00

internal_functions.c.in

Merge branch 'PHP-5.6' into PHP-7.0

2016-01-04 18:13:38 +01:00

main.c

Pass error severity to SAPI modules and raise corresponding error level in Apache

2016-07-11 09:34:48 +02:00

mergesort.c

first shot remove TSRMLS_* things

2014-12-13 23:06:14 +01:00

network.c

Merge branch 'PHP-7.0'

2016-05-16 11:21:39 +08:00

output.c

Remove TSRMLS_* from code, they are not used anymore

2016-02-17 22:44:05 -08:00

php_compat.h

Merge branch 'PHP-5.6' into PHP-7.0

2016-01-01 19:48:25 +02:00

php_content_types.c

Fix bug #71936 (Segmentation fault destroying HTTP_RAW_POST_DATA)

2016-06-20 18:43:07 +02:00

php_content_types.h

Merge branch 'PHP-5.6' into PHP-7.0

2016-01-01 19:48:25 +02:00

php_getopt.h

Merge branch 'PHP-5.6' into PHP-7.0

2016-01-01 19:48:25 +02:00

php_globals.h

Safe execution timeout handling.

2016-04-20 13:52:21 +03:00

php_ini.c

Merge branch 'PHP-7.0'

2016-01-01 20:04:31 +02:00

php_ini.h

Merge branch 'PHP-5.6' into PHP-7.0

2016-01-01 19:48:25 +02:00

php_main.h

Merge branch 'PHP-5.6' into PHP-7.0

2016-01-01 19:48:25 +02:00

php_memory_streams.h

Merge branch 'PHP-5.6' into PHP-7.0

2016-01-01 19:48:25 +02:00

php_network.h

Merge branch 'PHP-7.0'

2016-05-29 06:03:33 +01:00

php_open_temporary_file.c

Fixed the UTF-8 and long path support in the streams on Windows.

2016-06-20 12:45:39 +02:00

php_open_temporary_file.h

add flags to suppress the verbosity

2016-06-09 17:19:40 +02:00

php_output.h

Fix PUTC warning

2016-08-07 17:43:20 +02:00

php_reentrancy.h

Merge branch 'PHP-5.6' into PHP-7.0

2016-01-01 19:48:25 +02:00

php_scandir.c

Merge branch 'PHP-5.6' into PHP-7.0

2016-01-01 19:48:25 +02:00

php_scandir.h

Merge branch 'PHP-5.6' into PHP-7.0

2016-01-01 19:48:25 +02:00

php_sprintf.c

Merge branch 'PHP-5.6' into PHP-7.0

2016-01-01 19:48:25 +02:00

php_stdint.h

Merge branch 'PHP-5.6' into PHP-7.0

2016-01-01 19:48:25 +02:00

php_streams.h

fix blocking pipe stream option value

2016-08-17 00:53:15 +02:00

php_syslog.h

Merge branch 'PHP-5.6' into PHP-7.0

2016-01-01 19:48:25 +02:00

php_ticks.c

Merge branch 'PHP-5.6' into PHP-7.0

2016-01-01 19:48:25 +02:00

php_ticks.h

Merge branch 'PHP-5.6' into PHP-7.0

2016-01-01 19:48:25 +02:00

php_variables.c

Merge branch 'PHP-7.0'

2016-07-19 01:44:14 -07:00

php_variables.h

Merge branch 'PHP-5.6' into PHP-7.0

2016-01-01 19:48:25 +02:00

php_version.h

5.6.26 will be next

2016-08-04 01:39:37 +02:00

php.h

Use one place to define max length of double

2016-06-26 14:03:01 +01:00

reentrancy.c

Merge branch 'PHP-5.6' into PHP-7.0

2016-01-01 19:48:25 +02:00

rfc1867.c

Merge branch 'PHP-7.0' into PHP-7.1

2016-08-03 00:35:00 +02:00

rfc1867.h

Merge branch 'PHP-5.6' into PHP-7.0

2016-01-01 19:48:25 +02:00

SAPI.c

Merge branch 'PHP-7.0'

2016-07-19 01:44:14 -07:00

SAPI.h

Pass error severity to SAPI modules and raise corresponding error level in Apache

2016-07-11 09:34:48 +02:00

snprintf.c

Remove unneeded WS change

2016-06-26 13:26:43 +01:00

snprintf.h

Initial patch for 0 mode float conversion. The magic number is better to be improved. Any suggestion where to define it?

2016-06-26 13:26:42 +01:00

spprintf.c

Use one place to define max length of double

2016-06-26 14:03:01 +01:00

spprintf.h

Merge branch 'PHP-5.6' into PHP-7.0

2016-01-01 19:48:25 +02:00

strlcat.c

Merge branch 'PHP-5.6' into PHP-7.0

2016-01-01 19:48:25 +02:00

strlcpy.c

Merge branch 'PHP-5.6' into PHP-7.0

2016-01-01 19:48:25 +02:00

win95nt.h

Merge branch 'PHP-5.6' into PHP-7.0

2016-01-01 19:48:25 +02:00