Daniel Lowrey 3e0a1a71e9 Merge branch 'PHP-5.6' ...

* PHP-5.6:
  Fixed bug (#69195 Inconsistent stream crypto values across versions)

Conflicts:
	ext/standard/http_fopen_wrapper.c

2015-03-05 21:18:09 -07:00

..

streams

Merge branch 'PHP-5.6'

2015-03-05 21:18:09 -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

s/PHP 5/PHP 7/

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

fopen_wrappers.c

Avoid repeatable strlen() calls

2015-03-05 18:18:39 +03:00

fopen_wrappers.h

Use zend_string* instead of char* for opened_patch handling. Avoid reallocations and improve string reuse.

2015-03-04 02:05:28 +03:00

getopt.c

bump year

2015-01-15 23:27:30 +08:00

http_status_codes.h

bump year

2015-01-15 23:27:30 +08:00

internal_functions_nw.c

bump year

2015-01-15 23:27:30 +08:00

internal_functions_win32.c

bump year

2015-01-15 23:27:30 +08:00

internal_functions.c.in

second shot on removing TSRMLS_*

2014-12-14 14:07:59 +01:00

main.c

Use zend_string* instead of char* for opened_patch handling. Avoid reallocations and improve string reuse.

2015-03-04 02:05:28 +03:00

mergesort.c

first shot remove TSRMLS_* things

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

network.c

Merge branch 'PHP-5.6'

2015-01-31 21:50:08 -08:00

output.c

this line got accitentally dropped on merge

2015-02-19 10:50:03 +01:00

php_compat.h

bump year

2015-01-15 23:27:30 +08:00

php_content_types.c

bump year

2015-01-15 23:27:30 +08:00

php_content_types.h

bump year

2015-01-15 23:27:30 +08:00

php_getopt.h

bump year

2015-01-15 23:27:30 +08:00

php_globals.h

bump year

2015-01-15 23:27:30 +08:00

php_ini.c

Use zend_string* instead of char* for opened_patch handling. Avoid reallocations and improve string reuse.

2015-03-04 02:05:28 +03:00

php_ini.h

bump year

2015-01-15 23:27:30 +08:00

php_main.h

bump year

2015-01-15 23:27:30 +08:00

php_memory_streams.h

bump year

2015-01-15 23:27:30 +08:00

php_network.h

Merge branch 'PHP-5.6'

2015-01-31 21:50:08 -08:00

php_open_temporary_file.c

Use zend_string* instead of char* for opened_patch handling. Avoid reallocations and improve string reuse.

2015-03-04 02:05:28 +03:00

php_open_temporary_file.h

Use zend_string* instead of char* for opened_patch handling. Avoid reallocations and improve string reuse.

2015-03-04 02:05:28 +03:00

php_output.h

fix warnings

2015-01-30 22:32:00 +01:00

php_reentrancy.h

bump year

2015-01-15 23:27:30 +08:00

php_scandir.c

fix incompatible pointer warning

2015-02-03 17:52:18 +01:00

php_scandir.h

bump year

2015-01-15 23:27:30 +08:00

php_sprintf.c

bump year

2015-01-15 23:27:30 +08:00

php_stdint.h

bump year

2015-01-15 23:27:30 +08:00

php_streams.h

Merge branch 'PHP-5.6'

2015-03-05 17:53:04 -07:00

php_syslog.h

bump year

2015-01-15 23:27:30 +08:00

php_ticks.c

bump year

2015-01-15 23:27:30 +08:00

php_ticks.h

bump year

2015-01-15 23:27:30 +08:00

php_variables.c

Merged zend_array and HashTable into the single data structure.

2015-02-13 22:20:39 +03:00

php_variables.h

bump year

2015-01-15 23:27:30 +08:00

php_version.h

5.6.8 up next

2015-03-05 19:07:23 +01:00

php.h

bump year

2015-01-15 23:27:30 +08:00

reentrancy.c

bump year

2015-01-15 23:27:30 +08:00

rfc1867.c

Use zend_string* instead of char* for opened_patch handling. Avoid reallocations and improve string reuse.

2015-03-04 02:05:28 +03:00

rfc1867.h

bump year

2015-01-15 23:27:30 +08:00

SAPI.c

Revive Zend Signals handler (and fixed bug #61083)

2015-03-05 18:11:22 +08:00

SAPI.h

bump year

2015-01-15 23:27:30 +08:00

snprintf.c

bump year

2015-01-15 23:27:30 +08:00

snprintf.h

bump year

2015-01-15 23:27:30 +08:00

spprintf.c

Merge branch 'PHP-5.6'

2015-01-20 11:47:46 -08:00

spprintf.h

bump year

2015-01-15 23:27:30 +08:00

strlcat.c

bump year

2015-01-15 23:27:30 +08:00

strlcpy.c

bump year

2015-01-15 23:27:30 +08:00

win32_internal_function_disabled.h

bump year

2015-01-15 23:27:30 +08:00

win95nt.h

bump year

2015-01-15 23:27:30 +08:00