Xinchen Hui
d8651fbe1c
Make they are in the same style of Z_ISREF
2014-05-03 16:08:58 +08: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
Xinchen Hui
9fe8531309
Various bugs fixed
2014-04-24 21:14:36 +08:00
Nikita Popov
20580a511c
Fix ZTS build
2014-04-23 18:30:24 +02:00
Xinchen Hui
bd9f575517
Clean up (use zend_string and foreach macros)
2014-04-23 10:58:08 +08:00
Xinchen Hui
97381369a3
Refactored sqlite3 (all tests passes)
2014-04-23 00:17:29 +08:00
Dmitry Stogov
050d7e38ad
Cleanup (1-st round)
2014-04-15 15:40:40 +04:00
Anatol Belski
c5181ef6c2
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #66967 Updated the bundled libsqlite to 3.8.4.3
2014-04-11 11:01:01 +02:00
Anatol Belski
e08172e0d5
Fixed bug #66967 Updated the bundled libsqlite to 3.8.4.3
2014-04-11 11:00:10 +02:00
Anatol Belski
73b3f58bcd
updated libsqlite to 3.8.3.1 in 5.5 branch, too
2014-03-10 17:49:35 +01:00
Anatol Belski
2dd378df36
removed the libsqlite patch as it's not relevant anymore
2014-03-09 13:03:43 +01:00
Anatol Belski
61db86bff3
updated bundled libsqlite to 3.8.3.1
2014-03-09 13:01:48 +01: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
Nikita Popov
0d7a638866
Implement variadic function syntax
...
As per RFC: https://wiki.php.net/rfc/variadics
2013-09-26 18:39:17 +02:00
Anatol Belski
41d78110ff
let the libsqlite3 symbols be exported in dll
2013-09-17 13:05:44 +02: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
Stanislav Malyshev
c793a65690
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
non living code related typo fixes
Conflicts:
Zend/zend_compile.c
2013-08-04 16:06:24 -07:00
Veres Lajos
8d86597d73
non living code related typo fixes
2013-08-04 16:05:36 -07:00
Veres Lajos
e9a95d78ef
typo fixes
2013-07-15 00:23:03 -07:00
Veres Lajos
b79b13b4ef
less serious compatAbility fixes
2013-07-15 00:21:39 -07:00
Veres Lajos
bb64106f64
typos (orig)
2013-07-15 00:20:49 -07:00
Veres Lajos
72085b0e5f
typo fixes
2013-07-15 00:18:57 -07:00
Veres Lajos
b8a2b254a1
typos (orig)
2013-07-15 00:18:32 -07:00
Veres Lajos
227556c6a2
less serious compatAbility fixes
2013-07-15 00:17:35 -07:00
Stanislav Malyshev
02e4d7a290
Merge branch 'pull-request/341'
...
* pull-request/341: (23 commits)
typofixes
2013-06-10 14:30:59 -07:00
Stanislav Malyshev
ac40c0b562
Merge branch 'pull-request/341'
...
* pull-request/341: (23 commits)
typofixes
2013-06-10 14:20:18 -07:00
Stanislav Malyshev
84e35fb2e0
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
typo fixes (argument)
typo fixes (accommodate, parameter)
2013-06-10 13:36:41 -07:00
Veres Lajos
04145dc2aa
typo fixes (argument)
2013-06-10 13:36:17 -07:00
Veres Lajos
ed2e84e239
typo fixes (accommodate, parameter)
2013-06-10 13:36:03 -07:00
Lars Strojny
b16463a9fb
Merge branch 'PHP-5.4' into PHP-5.5
2013-01-14 17:36:07 +01:00
Lars Strojny
99d087e5d4
Fixed bug #63921 : sqlite3::bindvalue and relative PHP functions aren't using sqlite3_*_int64 API
2013-01-14 17:35:07 +01:00
Xinchen Hui
a666285bc2
Happy New Year
2013-01-01 16:37:09 +08:00
Xinchen Hui
0a7395e009
Happy New Year
2013-01-01 16:28:54 +08:00
Remi Collet
966faa9a87
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed Bug #63149 Feature missing with system SQLite
2012-11-24 17:56:23 +01:00
Remi Collet
67e67c254d
Fixed Bug #63149 Feature missing with system SQLite
...
In pdo_sqlite, getColumnMeta should return the table name.
With bundled SQLite library, -DSQLITE_ENABLE_COLUMN_METADATA=1 (other_flags)
enable the feature in SQLite (function sqlite3_column_table_name).
With system SQLite library, this fix detects if sqlite3_column_table_name is
available and add SQLITE_ENABLE_COLUMN_METADATA macro to get the same behavior.
Test already exists: ext/pdo_sqlite/tests/bug_42589.phpt
2012-11-24 17:47:51 +01:00
Stanislav Malyshev
a3322f8927
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fixed the common misspelling of the word occurred (occured -> occurred)
2012-06-30 17:00:25 -07:00
Marc Easen
896ac689c9
Fixed the common misspelling of the word occurred (occured -> occurred)
2012-06-30 16:54:03 -07:00
Johannes Schlüter
4f5c7ee240
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Improve check for :memory: pseudo-filename in SQlite
2012-06-22 12:50:55 +02:00
Johannes Schlüter
af516750ff
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Improve check for :memory: pseudo-filename in SQlite
Conflicts:
ext/sqlite3/sqlite3.c
2012-06-22 12:50:30 +02:00
Johannes Schlüter
055ecbc628
Improve check for :memory: pseudo-filename in SQlite
2012-06-22 12:48:39 +02:00
Anatoliy Belsky
6996a51d59
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fix bug #61791 ext\sqlite3\tests\sqlite3_15_open_error.phpt fails
2012-04-26 15:18:17 +02:00
Anatoliy Belsky
94d96f7782
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug #61791 ext\sqlite3\tests\sqlite3_15_open_error.phpt fails
Conflicts:
ext/sqlite3/tests/sqlite3_15_open_error.phpt
2012-04-26 15:17:46 +02:00
Anatoliy Belsky
4daab0abec
Fix bug #61791 ext\sqlite3\tests\sqlite3_15_open_error.phpt fails
2012-04-26 15:14:26 +02:00
Stanislav Malyshev
f43330a371
remove -dev for release
2012-02-28 18:43:44 +00:00
Rasmus Lerdorf
9722bff0c3
Missed the test
2012-01-29 04:20:50 +00:00
Rasmus Lerdorf
d8b312845c
Missed the test
2012-01-29 04:20:50 +00:00
Rasmus Lerdorf
191cc014be
Missed the test
2012-01-29 04:20:50 +00:00
Rasmus Lerdorf
ad5ae9e0bf
Good patch from Brad Dewar that adds missing createCollation()
...
method. Fixes bug #60871 and is related to bug #55226
2012-01-29 03:57:29 +00:00
Rasmus Lerdorf
9b55be870c
Good patch from Brad Dewar that adds missing createCollation()
...
method. Fixes bug #60871 and is related to bug #55226
2012-01-29 03:57:29 +00:00