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
100,359 Commits 491 Branches 1,363 Tags 847 MiB
00e516e575
Commit Graph

189 Commits

Author SHA1 Message Date
Remi Collet
397bedcc7c Fixed bug #73512 Fails to find firebird headers 
- use fb_config output instead of relying on hardoded path
 2016-11-16 10:47:02 +01:00
Anatol Belski
faae3122d2 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix blob parameters binding. Fixes: #73087, #61183, #71494
 2016-11-05 22:54:44 +01:00
Dorin Marcoci
3d73f718b2 Fix blob parameters binding. Fixes: #73087, #61183, #71494 
Adjusted formatting according to requirements

Test case for bug #73087
 2016-11-05 22:49:16 +01:00
Anatol Belski
4a142af316 fix test portability 2016-06-17 17:09:42 +02:00
Anatol Belski
3e6c02b91a fix ibase handle initialization, mostly compiler warnings 2016-06-06 13:30:17 +02:00
Xinchen Hui
36b4311edd Do not edit the value in place (might be relates to #71261) 2016-01-04 05:38:15 -08:00
Lior Kaplan
ed35de784f Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Happy new year (Update copyright to 2016)
 2016-01-01 19:48:25 +02:00
Lior Kaplan
49493a2dcf Happy new year (Update copyright to 2016) 2016-01-01 19:21:47 +02:00
Popa Adrian Marius
9ddfd49063 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Use LL_MASK for SQL_INT64 data formatting
 2015-12-03 17:13:45 +02:00
Popa Adrian Marius
8da5752311 Use LL_MASK for SQL_INT64 data formatting 2015-12-03 17:12:02 +02:00
Popa Adrian Marius
1745ead668 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fix Bug #60052	Integer returned as a 64bit integer on X64_86 for pdo_firebird
 2015-12-03 16:15:18 +02:00
Popa Adrian Marius
4173a667fa Fix Bug #60052 Integer returned as a 64bit integer on X64_86 for pdo_firebird 2015-12-03 16:14:17 +02:00
Anatol Belski
01c844a01d use Z* macro name 2015-11-05 22:39:10 +01:00
Anatol Belski
c1f893d894 fix NULL deref in pdo_firebird 
ref #70862
 2015-11-05 22:11:00 +01:00
Dmitry Stogov
7aa7627172 Use ZSTR_ API to access zend_string elements (this is just renaming without semantick changes). 2015-06-30 13:59:27 +03:00
Dmitry Stogov
70c86732cb Use zend_string to represent pdo_column_data.name and avoid duplication. 2015-05-05 16:19:51 +03:00
Anatol Belski
19360f386e cleanup mod version macros, round 3 2015-03-23 20:54:55 +01:00
Stanislav Malyshev
dfe6aea9ca size_t cleanup for PDO 2015-01-26 16:16:02 -08:00
Xinchen Hui
fc33f52d8c bump year 2015-01-15 23:27:30 +08:00
Xinchen Hui
0579e8278d bump year 2015-01-15 23:26:37 +08:00
Stanislav Malyshev
b7a7b1a624 trailing whitespace removal 2015-01-10 15:07:38 -08:00
Anatol Belski
bdeb220f48 first shot remove TSRMLS_* things 2014-12-13 23:06:14 +01:00
Andrea Faulds
c7157e4cfb Removed ZEND_ENGINE_2 checks (and ZE1 code, it's been a decade!) 2014-12-05 19:46:30 +00:00
Johannes Schlüter
d0cb715373 s/PHP 5/PHP 7/ 2014-09-19 18:33:14 +02:00
Anatol Belski
28b7a03318 master renamings phase 5 2014-08-25 21:20:44 +02:00
Anatol Belski
c3e3c98ec6 master renames phase 1 2014-08-25 19:24:55 +02:00
Anatol Belski
4ed156d4df ported from pdo - pgsql, odbc, mysql, firebirt, dblib 2014-08-19 19:02:07 +02:00
Anatol Belski
63d3f0b844 basic macro replacements, all at once 2014-08-19 08:07:31 +02:00
Dmitry Stogov
7435fc88a6 Fixed pdo_firebird tests failures 2014-08-11 23:56:34 +04:00
Xinchen Hui
ad1ef9b629 Refactored ext/pdo_firebird (didn't do test) 2014-05-21 15:52:36 +08: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
Popa Adrian Marius
0edf1d4fe6 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Cleanup ZEND_MODULE_API_NO => 20050922
 2014-04-28 12:14:01 +03:00
Popa Adrian Marius
a827fa9cd8 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Cleanup ZEND_MODULE_API_NO => 20050922
 2014-04-28 12:13:44 +03:00
Popa Adrian Marius
bb422cb60e Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Cleanup ZEND_MODULE_API_NO => 20050922
 2014-04-28 12:13:11 +03:00
Popa Adrian Marius
dbcd6304bb Cleanup ZEND_MODULE_API_NO => 20050922 2014-04-28 12:12:52 +03: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
Dmitry Stogov
050d7e38ad Cleanup (1-st round) 2014-04-15 15:40:40 +04:00
Popa Adrian Marius
4048872317 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Cleanup $ is not needed for git
 2014-04-10 17:43:29 +03:00
Popa Adrian Marius
1a0b80fe90 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Cleanup $ is not needed for git
 2014-04-10 17:43:09 +03:00
Popa Adrian Marius
1c3ed86211 Cleanup $ is not needed for git 2014-04-10 17:42:32 +03:00
Popa Adrian Marius
002c8e8356 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  cleanup
  Fixes bug #66071: isc_interprete is unsafe and deprecated , it is replaced with fb_iterpret
 2014-04-08 17:52:22 +03:00
Popa Adrian Marius
4141ceb795 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  cleanup
  Fixes bug #66071: isc_interprete is unsafe and deprecated , it is replaced with fb_iterpret
 2014-04-08 17:51:54 +03:00
Popa Adrian Marius
0ea731fc83 cleanup 2014-04-08 17:51:06 +03:00
Popa Adrian Marius
cc20351134 Fixes bug #66071: isc_interprete is unsafe and deprecated , it is replaced with fb_iterpret 2014-04-08 17:50:41 +03:00
Xinchen Hui
c081ce628f Bump year 2014-01-03 11:08:10 +08:00
Xinchen Hui
47c9027772 Bump year 2014-01-03 11:06:16 +08:00
Xinchen Hui
c0d060f5c0 Bump year 2014-01-03 11:04:26 +08:00
Popa Adrian Marius
074385cb33 Prepare pdo_firebird for a pecl release also 2013-09-12 17:47:05 +03:00
Christopher Jones
c6d977dd39 Fix long-standing visual pain point: the misalignment of './configure help' text. 
Whitespace changes and a couple of grammar fixes.
 2013-08-06 11:06:09 -07:00
Matteo Beccati
a3b5b42e77 Merge branch 'PHP-5.3' into PHP-5.4 2013-05-31 16:26:54 +02:00