clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-24 11:27:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
bce6a36c8a
php-src/main
History
Dmitry Stogov bce6a36c8a Merge branch 'master' into test 
* master: (48 commits)
  change locale - looks like not everybody has sl_SI
  Fix bug #66921 - Wrong argument type hint for function intltz_from_date_time_zone
  fix format
  Fix bug #67052 (NumberFormatter::parse() resets LC_NUMERIC setting)
  Make sure the generator script also creates a newline at the end of file
  Add newline at end of file to prevent compilation warning
  Fix handling of session user module custom handlers.
  Reference bug report instead of github issue in NEWS file
  add more exts for Travis
  Update NEWS
  Fix phpdbg.1 man page installation when build != src directory
  BFN for bug #67551 (php://input temp file will be located in sys_temp_dir instead of upload_tmp_dir)
  reorder
  restore API compatibility
  finish
  refactor php_stream_temp_create{,_ex} and use it for the php://input stream
  refactor _php_stream_fopen_{temporary_,tmp}file()
  fix length overflow of HTTP_RAW_POST_DATA
  Update NEWS
  Fixed bug #67215 (php-cgi work with opcache, may be segmentation fault happen)
  ...

Conflicts:
	ext/opcache/zend_accelerator_util_funcs.c
	ext/session/mod_user.c
	ext/spl/spl_array.c
	ext/spl/spl_dllist.c
	ext/standard/file.c
	ext/standard/streamsfuncs.c
	ext/standard/string.c
	main/streams/memory.c
2014-07-07 19:21:23 +04:00
..
streams Merge branch 'master' into test 2014-07-07 19:21:23 +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 Simplify call-frame handling 2014-07-07 15:50:44 +04:00
mergesort.c - MFH Cleanup exports and allow to overwrite ext registration 2008-08-22 12:59:46 +00:00
network.c Use better data structures (incomplete) 2014-02-10 10:04:30 +04:00
output.c Fixed wrong comparisons 2014-05-15 21:06:39 +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 Bump year 2014-01-03 11:08:10 +08: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 Merge mainstream 'master' branch into refactoring 2014-04-26 00:32:51 +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 Combine HashTable.flags and HashTable.nApplyCount into single 32-bit word 2014-04-21 18:25:34 +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 Bump year 2014-01-03 11:08:10 +08:00
snprintf.h Bump year 2014-01-03 11:08:10 +08:00
spprintf.c Test push (previous push didn't send mail?) 2014-05-10 11:19:21 +08: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