archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-19 08:49:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
102961 commits 526 branches 1434 tags 878 MiB
Commit graph

1535 commits

Author SHA1 Message Date
Rasmus Lerdorf
7fe21ce0f3 Merge commit '8b9719d' into PHP-5.6 
* commit '8b9719d':
  We need to turn off any strict mode here for this warning to show up
 2014-07-30 12:23:36 -04:00
Rasmus Lerdorf
579c9066a0 Merge commit '8b9719d' into PHP-5.5 
* commit '8b9719d':
  We need to turn off any strict mode here for this warning to show up
 2014-07-30 12:23:24 -04:00
Rasmus Lerdorf
8b9719d8b9 We need to turn off any strict mode here for this warning to show up 2014-07-30 12:22:48 -04:00
Xinchen Hui
110bf9c720 Merge remote-tracking branch 'origin/master' into phpng 
Conflicts:
	Zend/zend_compile.h
	ext/openssl/xp_ssl.c
 2014-07-18 16:25:43 +08:00
Andrey Hristov
06f5f65c94 Add some trace info as well as update CLIENT_ flags 2014-07-16 19:24:39 +03:00
Dmitry Stogov
2ed8a17045 Refactored run_time_cache usage in object handlers 2014-07-07 20:54:31 +04:00
Timm Friebe
9b6062071e Adjust expected fatal error message 
Now also includes "on [TYPE]" after merge from master
 2014-07-06 17:07:41 +02:00
Timm Friebe
a1554ca634 Merge in changes from master 
Now also includes "on [TYPE]" in "Call to a member function" error
 2014-07-06 17:07:01 +02:00
Xinchen Hui
2f574e282e Suppress warning 2014-06-28 00:09:26 +08:00
Xinchen Hui
2d67b36a92 Fixed build with libmysql 2014-06-27 23:58:55 +08:00
Xinchen Hui
8ce23d8f4f Don't use zend_string for other fields (only name here is enough) 2014-06-25 00:42:20 +08:00
Xinchen Hui
56a966e88a Respect the origin behavior (fix one test: ext/pdo_mysql/tests/bug_33689.phpt) 2014-06-23 19:34:55 +08:00
Xinchen Hui
92a7089893 Use zend_string in mysqlnd 2014-06-23 19:27:24 +08:00
Dmitry Stogov
629c9d3eda Merge branch 'master' into phpng 
* master:
  Fixed MarinaDB support
 2014-06-20 14:02:15 +04:00
Dmitry Stogov
f08a5bfadc Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed MarinaDB support
 2014-06-20 13:58:26 +04:00
Dmitry Stogov
f0639611cf Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed MarinaDB support
 2014-06-20 13:57:38 +04:00
Dmitry Stogov
680ddabac1 Fixed MarinaDB support 2014-06-20 13:56:32 +04:00
Dmitry Stogov
36374ff32d Merge branch 'master' into phpng 
* master:
  skip this test which fails without network
  add missing entry to NEWS
  add missing entry to NEWS
  add NEWS block for 5.6.0RC2
  Add support for gb18030/MySQL 5.7
  Fix another problem with MySQL 5.7
  new test, missing in ea466a3
  Suppress test failure with MySQL 5.7
 2014-06-20 11:16:57 +04:00
Xinchen Hui
33aa5eb6b6 Refcount may have different meaning in PHP NG 2014-06-19 22:36:48 +08:00
Xinchen Hui
e2b182b24f Fixed mysqli_get_links_stats 2014-06-19 22:30:15 +08:00
Xinchen Hui
4cc3c7387b Fixed hash key in persistent hash 2014-06-19 16:24:24 +08:00
Xinchen Hui
46117aff49 Fixed releasing of hash_key 2014-06-19 16:20:21 +08:00
Xinchen Hui
b7b5fa111b Fixed MySQLi built with mysqlnd 2014-06-19 11:10:03 +08:00
Andrey Hristov
f201bf2305 Fix another problem with MySQL 5.7 2014-06-18 18:30:37 +03:00
Andrey Hristov
23f77050eb Merge branch 'PHP-5.5' into PHP-5.6 2014-06-18 16:42:42 +03:00
Andrey Hristov
21c9a9388f Suppress test failure with MySQL 5.7 2014-06-18 16:20:14 +03:00
Dmitry Stogov
dd1c68e67f Merge branch 'master' into phpng 
* master: (77 commits)
  NEWS entry for Fix potential segfault in dns_get_record()
  NEWS entry for "Fix potential segfault in dns_get_record()"
  NEWS entry for Fix potential segfault in dns_get_record(
  Fix potential segfault in dns_get_record()
  Revert "Add optional second arg to unserialize()"
  5.5.15 now
  update NEWS
  Fix bug #66127 (Segmentation fault with ArrayObject unset)
  5.4.31 next
  Add NEWS. This doesn't need UPGRADING (or an RFC), IMO.
  Fix broken test.
  Add a mime type map generation script and update the header.
  Move the mime type map out of php_cli_server.c for easier generation.
  Replace the CLI server's linear search for extensions with a hash table.
  fix test
  Remove unused included file
  NEWS
  NEWS
  NEWS
  Fixed Bug #67413 	fileinfo: cdf_read_property_info insufficient boundary chec
  ...

Conflicts:
	Zend/zend_closures.c
	Zend/zend_execute.c
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
	ext/spl/spl_array.c
	ext/standard/basic_functions.c
	ext/standard/dns.c
	ext/standard/var.c
 2014-06-12 05:07:33 +04:00
Dmitry Stogov
edb064e2ee Fixed call to mysqli_init() from an object. (We should find some better fix) 2014-06-12 00:57:10 +04:00
Dmitry Stogov
bccd4184a5 Fixed error messages 2014-06-12 00:33:43 +04:00
Boro Sitnikovski
cfccdc6362 Bug 64744 
Show the type of the non-object for more descriptive errors
 2014-06-08 19:14:58 -07:00
Dmitry Stogov
6e7338700e Avoid useless merge 2014-06-04 02:11:26 +04:00
Andrey Hristov
90cad3de2f Add one more check to skip getting into code that will do nothing 2014-05-20 14:50:50 +03:00
Xinchen Hui
a4a1fc5552 Fixed signed 2014-05-17 10:28:54 +08: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
c057b3f63d Finish refactoring of MySQLi 
a few tests failed due to knew issue, I will disscuss with dmitry later
 2014-05-11 19:37:48 +08:00
Xinchen Hui
446c60c616 Various bug fixes (now 17 tests fails, it is 11 in trunk) 2014-05-11 17:02:08 +08:00
Xinchen Hui
53b930475f Various bug fixed 2014-05-11 16:05:14 +08:00
Xinchen Hui
2402d6cbbc Refactor MySQLi (incompleted, only compilable now) 2014-05-11 14:53:18 +08:00
Andrey Hristov
1a293e6bd9 rename a constant - old name to new name 2014-05-06 11:36:03 +03:00
Dmitry Stogov
cd4b4dfc4d Merge branch 'master' into refactoring2 
Conflicts:
	Zend/zend_hash.c
	ext/date/php_date.c
 2014-05-05 13:02:43 +04:00
Adam Harvey
06a03bbfa6 Fix mysqli build when building against libmysqlclient. 2014-05-02 14:33:52 -07: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
Timm Friebe
a6f7f58a87 Make E_RECOVERABLE_ERRORs (4096) show up 2014-04-19 14:45:29 +02:00
Timm Friebe
9265077bb0 Adjust expected outcome (non-Zend tests) 2014-04-19 14:09:10 +02:00
Dmitry Stogov
050d7e38ad Cleanup (1-st round) 2014-04-15 15:40:40 +04:00
Stanislav Malyshev
173cd183c9 fix test - doesn't seem to produce warning 2014-04-14 15:47:06 -07:00
Andrey Hristov
ce99f292de Merge branch 'PHP-5.5' into PHP-5.6 
Conflicts:
	ext/mysqli/tests/mysqli_change_user_old.phpt
 2014-04-14 17:44:13 +03:00
Andrey Hristov
dae70a2ff7 Add test 2014-04-14 17:35:01 +03:00
Andrey Hristov
af5fa00c97 Fix the fix 2014-04-10 18:13:44 +03:00