clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-01 14:56:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
72,834 Commits 494 Branches 1,367 Tags 801 MiB
9fb0dba4be
Commit Graph

193 Commits

Author SHA1 Message Date
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
Rasmus Lerdorf
8850050039 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
Felipe Pena
e4ca0ed09f - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
8775a37559 - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
4e19825281 - Year++ 2012-01-01 13:15:04 +00:00
Pierre Joye
b660f32dab - add skipif 2011-09-06 07:29:59 +00:00
Pierre Joye
702a5de5ac - add skipif 2011-09-06 07:29:59 +00:00
Pierre Joye
d6a6c1892b - add skipif 2011-09-06 07:29:59 +00:00
Pierre Joye
9fa90f8a90 - add skipif 2011-09-06 07:28:38 +00:00
Pierre Joye
ce70e2b8fd - add skipif 2011-09-06 07:28:38 +00:00
Pierre Joye
95aefb0114 - add skipif 2011-09-06 07:28:38 +00:00
Rasmus Lerdorf
78a46b87e3 Fix another broken test. root can read 0200 files. 2011-08-29 06:19:40 +00:00
Rasmus Lerdorf
bf3bb1efbe Fix another broken test. root can read 0200 files. 2011-08-29 06:19:40 +00:00
Rasmus Lerdorf
7c7aa30322 Fix another broken test. root can read 0200 files. 2011-08-29 06:19:40 +00:00
Ilia Alshanetsky
4ef26e2379 Fixed memset usage (identified by coverity) 2011-08-10 15:30:07 +00:00
Ilia Alshanetsky
d73bad2f93 Fixed memset usage (identified by coverity) 2011-08-10 15:30:07 +00:00
Ilia Alshanetsky
38f05cc775 Fixed memset usage (identified by coverity) 2011-08-10 15:30:07 +00:00
Scott MacVicar
27d50d6470 Update SQLite3 to the latest version 2011-08-09 07:31:34 +00:00
Scott MacVicar
7402dee014 Update SQLite3 to the latest version 2011-08-09 07:31:34 +00:00
Scott MacVicar
929e0f185c Update SQLite3 to the latest version 2011-08-09 07:31:34 +00:00
Joey Smith
b61ea14729 Fix an unchecked return - change was back-migrated 
from version 3.7.6.3 of sqlite.c from upstream.
 2011-08-09 06:36:47 +00:00
Rasmus Lerdorf
636c61c1d5 Not our issue, but fixing here for now and reporting upstream 2011-08-06 23:34:13 +00:00
Rasmus Lerdorf
d03961b23b Not our issue, but fixing here for now and reporting upstream 2011-08-06 23:34:13 +00:00
Rasmus Lerdorf
facfed523d Not our issue, but fixing here for now and reporting upstream 2011-08-06 23:34:13 +00:00
Felipe Pena
23e438594d - Make usage of new PHP_FE_END macro 2011-07-25 11:42:53 +00:00
Felipe Pena
4b30846b50 - Make usage of new PHP_FE_END macro 2011-07-25 11:35:02 +00:00
Felipe Pena
da376383e8 - Make usage of new PHP_FE_END macro 2011-07-25 11:35:02 +00:00
Scott MacVicar
c2ca352598 Upgrade SQLite to 3.7.6.3 2011-06-14 17:00:49 +00:00
Scott MacVicar
08e7b84b7b Upgrade SQLite to 3.7.6.3 2011-06-14 17:00:49 +00:00
Scott MacVicar
e39ed9781e Upgrade SQLite to 3.7.6.3 2011-06-14 17:00:49 +00:00
Felipe Pena
32b5f8a1a3 - Added new parameter parsing option (p - for valid path (string without null byte in the middle)) 
# The tests will be fixed in the next commits
 2011-06-06 21:28:16 +00:00