php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-29 11:13:36 +02:00
Code Issues Packages Projects Releases Wiki Activity
81,810 Commits 549 Branches 1,486 Tags
f75c04ac8da837da1a264eb0edbe383ae71ae199
Commit Graph

4074 Commits

Author SHA1 Message Date
Dmitry Stogov 2777662694 Hide warning message after fatal errors 2014-06-20 13:31:43 +04:00
Dmitry Stogov 5152422194 Check if socket is still alive 2014-06-20 13:31:23 +04:00
Dmitry Stogov b108267f2c Merge branch 'master' into phpng 
* master: (41 commits)
  Update copyright year to 2014
  Update copyright year to 2014
  Update copyright year to 2014
  Update copyright year to 2014
  Update copyright year to 2014
  Update copyright year to 2014
  Update copyright year to 2014
  NEWS
  Fix Request #67453 Allow to unserialize empty data.
  Update copyright year to 2014
  Update copyright year for re2c generated files
  Update copyright year to 2014
  Update copyright year for re2c files as well
  Fix patch for bug #67436
  fix failed test
  Fix test on modern distro where old unsecure algo are disabled in openssl config. Testing recent algo should be enough to check this function.
  Added tests for bug 67436
  Fixed wrong XFAIL test - already fixed
  Fix typo in Bug #67406 NEWS entry
  Fix typo in Bug #67406 NEWS entry
  ...

Conflicts:
	Zend/zend_compile.c
	ext/session/session.c
	ext/standard/array.c
	ext/standard/http_fopen_wrapper.c
	tests/classes/bug63462.phpt
 2014-06-18 17:50:27 +04:00
Adam Harvey a92e3eb0fe Merge branch 'PHP-5.6' 
* PHP-5.6:
  Keep 308-399 HTTP response codes when header('Location:') is called.
 2014-06-12 17:42:29 -07:00
Adam Harvey 82231b5d89 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Keep 308-399 HTTP response codes when header('Location:') is called.
 2014-06-12 17:40:51 -07:00
Adam Harvey aa3a5f7681 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Keep 308-399 HTTP response codes when header('Location:') is called.
 2014-06-12 17:38:52 -07:00
Adam Harvey 1b9cbab9a7 Keep 308-399 HTTP response codes when header('Location:') is called. 
Fixes bug #67428 (header('Location: foo') will override a 308-399 response
code).
 2014-06-12 17:35:05 -07:00
Julien Pauli a6e0751079 5.5.15 now 2014-06-11 10:21:26 +02:00
Stanislav Malyshev 979eed5c6b 5.4.31 next 2014-06-10 23:03:40 -07:00
Xinchen Hui 922285ec55 Don't use cast (compiler friendly) 2014-05-26 11:05:04 +08:00
Xinchen Hui 59d74db108 Fixed segafult while stream is referenced by persistent resource (like dba) 2014-05-21 13:11:56 +08:00
Xinchen Hui 98f801ccbc Fixed resources apply_dtor 2014-05-19 14:53:02 +08:00
Xinchen Hui d86fa38cc5 Fixed uninitialized used 2014-05-18 21:04:43 +08:00
Dmitry Stogov 16d3d5dc53 Fixed wrong comparisons 2014-05-15 21:06:39 +04:00
Pierre Joye 6ad1d7d831 forgot that hash uses ending 0 2014-05-15 10:39:35 +02:00
Pierre Joye 365446763f zend_hash_del>zend_hash_str_del 2014-05-15 10:16:19 +02:00
Julien Pauli b4c92f31ad 5.5.14 now 2014-05-14 10:24:32 +02:00
Stanislav Malyshev b1c944dfd2 5.4.30 next 2014-05-13 22:20:15 -07:00
Dmitry Stogov 7fcd4064c0 Merge branch 'master' into phpng 
* master: (41 commits)
  fix test - output can be chunked
  fix test
  fix test
  Fixed test for commit 997be125eb
  Add bug fix to NEWS
  Update UPGRADING according to bug fix
  fix test
  improve CURL tests to allow testing without separate server
  improve CURL tests to allow testing without separate server
  Fixed bug #67199	mb_regex_encoding mishmash
  Fix bug #67248 (imageaffinematrixget missing check of parameters)
  Fix bug #67247	spl_fixedarray_resize integer overflow
  fix news
  add tests stuff to README
  Updated NEWS
  Fix Linux specific fail in error traces (cherry-picked and fix for bug #67245) Linux apparently does not like memcpy in overlapping regions...
  - Fixed off-by-one in phar_build (patch by crrodriguez at opensuse dot org)
  - Move checking
  - Fixed missing NULL check in SimpleXMLElement::xpath()
  - Fixed missing NULL check
  ...

Conflicts:
	ext/bz2/bz2.c
	ext/gd/gd.c
	ext/mbstring/php_mbregex.c
	ext/session/tests/031.phpt
	ext/simplexml/simplexml.c
	ext/spl/spl_fixedarray.c
 2014-05-13 15:24:40 +04:00
Xinchen Hui 5ce6c33f65 Test push (previous push didn't send mail?) 2014-05-10 11:19:21 +08:00
Xinchen Hui beb042090d Added smart_string to avoid string duplicated 
for now, if we want result a char * use smart_string, if zend_string
 use smart_str
 2014-05-10 11:09:17 +08:00
Xinchen Hui 88c550a799 Added vstrpprintf strpprintf to avoid duplicate string 
(the function name maybe improvement)
 2014-05-10 00:21:49 +08:00
Xinchen Hui c242518bf0 There should been memory leaks(and don't use pointer cast) 2014-05-08 15:20:13 +08:00
Xinchen Hui 2393000aeb Prefer the macro we defined 2014-05-07 17:06:27 +08:00
Xinchen Hui ed5b6af8af Refactored filter 2014-05-07 16:52:58 +08:00
Xinchen Hui 8b90b17c8d Merge branch 'phpng' of git.php.net:php-src into phpng 2014-05-07 13:50:53 +08:00
Xinchen Hui 9ef21b7606 Refactor fileinfo 2014-05-07 13:50:29 +08:00
Pierre Joye 38c886a449 -- missing length declaration, may have worked w/some gcc as length is not used in the macro but still need it, ifdef just make code uncertain. will get opt out anyway if not used 2014-05-07 07:31:21 +02:00
Michael Wallner 86b6bfb9b7 fix bug #67198 (php://input regression) 2014-05-06 12:22:08 +02:00
Michael Wallner 7308d47c4b fix bug #67198 (php://input regression) 2014-05-06 12:21:43 +02:00
Xinchen Hui d8651fbe1c Make they are in the same style of Z_ISREF 2014-05-03 16:08:58 +08:00
Nikita Popov e0247de147 zend_stack_top() now returns pointer directly 2014-05-01 09:08:30 +02:00
Nikita Popov 5a03efe279 Don't allocate zend_stack elements individually 
Instead allocate a vector of elements. Size must now be specified
on initialization rather than on push.
 2014-05-01 09:08:29 +02:00
Dmitry Stogov 17d027ed47 Split IS_BOOL into IS_FALSE and IS_TRUE 2014-04-30 18:32:42 +04:00
Dmitry Stogov f9927a6c97 Merge mainstream 'master' branch into refactoring 
During merge I had to revert:
	Nikita's patch for php_splice() (it probably needs to be applyed again)
	Bob Weinand's patches related to constant expression handling (we need to review them carefully)
	I also reverted all our attempts to support sapi/phpdbg (we didn't test it anyway)

Conflicts:
	Zend/zend.h
	Zend/zend_API.c
	Zend/zend_ast.c
	Zend/zend_compile.c
	Zend/zend_compile.h
	Zend/zend_constants.c
	Zend/zend_exceptions.c
	Zend/zend_execute.c
	Zend/zend_execute.h
	Zend/zend_execute_API.c
	Zend/zend_hash.c
	Zend/zend_highlight.c
	Zend/zend_language_parser.y
	Zend/zend_language_scanner.c
	Zend/zend_language_scanner_defs.h
	Zend/zend_variables.c
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
	ext/date/php_date.c
	ext/dom/documenttype.c
	ext/hash/hash.c
	ext/iconv/iconv.c
	ext/mbstring/tests/zend_multibyte-10.phpt
	ext/mbstring/tests/zend_multibyte-11.phpt
	ext/mbstring/tests/zend_multibyte-12.phpt
	ext/mysql/php_mysql.c
	ext/mysqli/mysqli.c
	ext/mysqlnd/mysqlnd_reverse_api.c
	ext/mysqlnd/php_mysqlnd.c
	ext/opcache/ZendAccelerator.c
	ext/opcache/zend_accelerator_util_funcs.c
	ext/opcache/zend_persist.c
	ext/opcache/zend_persist_calc.c
	ext/pcre/php_pcre.c
	ext/pdo/pdo_dbh.c
	ext/pdo/pdo_stmt.c
	ext/pdo_pgsql/pgsql_driver.c
	ext/pgsql/pgsql.c
	ext/reflection/php_reflection.c
	ext/session/session.c
	ext/spl/spl_array.c
	ext/spl/spl_observer.c
	ext/standard/array.c
	ext/standard/basic_functions.c
	ext/standard/html.c
	ext/standard/mail.c
	ext/standard/php_array.h
	ext/standard/proc_open.c
	ext/standard/streamsfuncs.c
	ext/standard/user_filters.c
	ext/standard/var_unserializer.c
	ext/standard/var_unserializer.re
	main/php_variables.c
	sapi/phpdbg/phpdbg.c
	sapi/phpdbg/phpdbg_bp.c
	sapi/phpdbg/phpdbg_frame.c
	sapi/phpdbg/phpdbg_help.c
	sapi/phpdbg/phpdbg_list.c
	sapi/phpdbg/phpdbg_print.c
	sapi/phpdbg/phpdbg_prompt.c
 2014-04-26 00:32:51 +04:00
Anatol Belski 60f976a45e Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix dll export
 2014-04-24 10:53:31 +02:00
Anatol Belski 9280e25534 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix dll export
 2014-04-24 10:52:59 +02:00
Anatol Belski acfed1c4c7 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix dll export
 2014-04-24 10:52:22 +02:00
Anatol Belski 03be983398 fix dll export 2014-04-24 10:51:42 +02:00
Dmitry Stogov 7584ae3200 Fixed compilaation warnings 2014-04-22 18:52:59 +04:00
Dmitry Stogov 72c287bd23 Combine HashTable.flags and HashTable.nApplyCount into single 32-bit word 2014-04-21 18:25:34 +04:00
Stanislav Malyshev dd9c80e44b Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix bug #65701: Do not use cache for file file copy
 2014-04-20 15:27:55 -07:00
Stanislav Malyshev 774f16318b Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix bug #65701: Do not use cache for file file copy
 2014-04-20 15:27:39 -07:00
Stanislav Malyshev 5addf223d5 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #65701: Do not use cache for file file copy
 2014-04-20 15:25:03 -07:00
Boro Sitnikovski a18cec1b86 Fix bug #65701: Do not use cache for file file copy 2014-04-20 15:22:44 -07:00
Stanislav Malyshev 1d34d82231 5.4.29 is next 2014-04-15 16:51:38 -07:00
Julien Pauli b8d029435d 5.5.12RC1 setup 2014-04-15 17:57:27 +02:00
Dmitry Stogov 050d7e38ad Cleanup (1-st round) 2014-04-15 15:40:40 +04:00
Ferenc Kovacs fb326bbd9b Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix typo
 2014-04-13 01:57:49 +02:00
Ferenc Kovacs 51cbb85ea9 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix typo
 2014-04-13 01:57:15 +02:00