Commit Graph

261 Commits

Author SHA1 Message Date
Xinchen Hui
c081ce628f Bump year 2014-01-03 11:08:10 +08:00
Xinchen Hui
d4f5ca467f Merge branch 'PHP-5.4' into PHP-5.5
Conflicts:
	configure.in
	ext/mysqlnd/mysqlnd.c
	main/php_version.h
2013-11-05 11:08:09 +08:00
Xinchen Hui
e3d9e18e7b Fixed Bug #66034 (Segmentation Fault when constructor of PDO statement throws an exception)
I know zend_call_function will initilize retval_ptr_ptr, but still set
it to NULL explict is more readable
2013-11-05 11:04:55 +08: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
Yasuo Ohgaki
cb13f8318b Add user contributed test. Bug #61748 2013-08-02 09:52:08 +09:00
Lars Strojny
1e9a3ed234 Fix bug #63916: PDO::PARAM_INT casts to 32bit int internally even on 64bit builds in pdo_sqlite 2013-01-14 17:59:11 +01:00
Xinchen Hui
0a7395e009 Happy New Year 2013-01-01 16:28:54 +08: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
Pierre Joye
0e0d79218f - fix #55226, WS 2012-01-31 07:17:05 +00:00
Pierre Joye
0c87d70b1a - fix #55226, WS 2012-01-31 07:17:05 +00:00
Pierre Joye
3115e6497a - fix #55226, fix build 2012-01-31 07:14:36 +00:00
Pierre Joye
d056f9ccb2 - fix #55226, fix build 2012-01-31 07:14:36 +00:00
Rasmus Lerdorf
9111a8a58a createCollation() for pdo_sqlite as well
Closes bug #55226
2012-01-29 04:22:23 +00:00
Rasmus Lerdorf
abff96d02e createCollation() for pdo_sqlite as well
Closes bug #55226
2012-01-29 04:22:23 +00:00
Felipe Pena
e4ca0ed09f - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
4e19825281 - Year++ 2012-01-01 13:15:04 +00:00
Dmitry Stogov
cacf363957 Fixed bug #60104 (Segmentation Fault in pdo_sqlite when using sqliteCreateFunction()) 2011-11-08 10:11:25 +00:00
Patrick Allaert
9da01ac6b6 Added test for #60104 2011-11-04 19:13:37 +00:00
Ilia Alshanetsky
42f3972e61 Avoid strcpy() usage 2011-08-08 00:07:54 +00:00
Ilia Alshanetsky
1271828ee4 Avoid strcpy() usage 2011-08-08 00:07:54 +00:00
Felipe Pena
997f323e3a - Added ZEND_MOD_END macro to use in the end of zend_module_dep[] 2011-08-06 14:47:44 +00:00
Felipe Pena
707a8f70b8 - Added ZEND_MOD_END macro to use in the end of zend_module_dep[] 2011-08-06 14:47:44 +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
f4554096e1 - New tests (code coverage++) 2011-06-19 12:33:49 +00:00
Felipe Pena
fbb5aae32c - New tests (code coverage++) 2011-06-19 12:33:49 +00:00
Rasmus Lerdorf
d257aa42ff Oops, can't cache it here because it won't work
in autoconf2.13 and we still support that version
in this branch
2011-05-15 05:49:34 +00:00
Rasmus Lerdorf
8e256774b0 Cache the PDO include path 2011-05-15 05:24:34 +00:00
Rasmus Lerdorf
78a15091f9 Cache the pdo include path 2011-05-15 05:03:29 +00:00
Felipe Pena
927bf09c29 - Year++ 2011-01-01 02:19:59 +00:00
Felipe Pena
0203cc3d44 - Year++ 2011-01-01 02:17:06 +00:00
Felipe Pena
938265115b - New test 2010-07-29 23:46:49 +00:00
Felipe Pena
30a8dcff1b - New test 2010-07-29 23:46:49 +00:00
Felipe Pena
c6e852d7db - Completed the fix for bug #52010
# Fixing pdo drivers
2010-06-20 14:12:06 +00:00
Felipe Pena
f7f74b4c0e - Completed the fix for bug #52010
# Fixing pdo drivers
2010-06-20 14:12:06 +00:00
Kalle Sommer Nielsen
dd8e59da8f Removed safe_mode
* Removed ini options, safe_mode*
 * Removed --enable-safe-mode --with-exec-dir configure options on Unix
 * Updated extensions, SAPI's and core
 * php_get_current_user() is now declared in main.c, thrus no need to include safe_mode.h anymore
2010-04-26 23:53:30 +00:00
Johannes Schlüter
ed03634a8c Revert 290786: Fixed bug #49521 (PDO fetchObject sets values before calling
constructor)
2010-02-11 22:14:06 +00:00
Ilia Alshanetsky
d2e14e3f20 Fixed bug #50728 (All PDOExceptions hardcode 'code' property to 0) 2010-01-12 12:46:54 +00:00
Sebastian Bergmann
9ba1e81665 sed -i "s#1997-2009#1997-2010#g" **/*.c **/*.h **/*.php 2010-01-03 09:23:27 +00:00
Felipe Pena
c00a91a024 - Added SKIPIF 2009-12-15 00:37:43 +00:00
Felipe Pena
286f36e702 - Fixed memory leak when E_STRICT message is getted 2009-12-14 21:44:56 +00:00
Felipe Pena
a94558c855 - Added MAKE_COPY_ZVAL(ppzv, pzv) macro 2009-12-08 01:57:37 +00:00
Rasmus Lerdorf
937358ebc7 Revert attempt at supporting both autoconf 2.13 and
modern versions in the same build chain.  There are
simply too many broken things in 2.13 to make it work.
Cache handling is broken as well which is why I need
to revert the pdo_inc_path cache fix as well.

trunk is now 2.60+ only and I'll work on cleaning out
all the legacy cruft from there.
2009-11-29 06:13:22 +00:00
Rasmus Lerdorf
5a2b41a627 Someone strap down Jani and give him a sedative please.
This makes our toolchain work with the latest versions
of autoconf and avoids a lot of end-user grief.
2009-11-25 01:30:06 +00:00
Felipe Pena
4bafbf58f8 - Fixed bug #49521 (PDO fetchObject sets values before calling constructor)
(patch by Pierrick)
2009-11-15 16:20:37 +00:00
Scott MacVicar
cd5e3b1632 Add metadata support to the bundled version of libsqlite on Windows, part of bug #49206.
Will commit the new feature part separately.
2009-10-16 02:22:48 +00:00
Kalle Sommer Nielsen
4f3d67ea89 Don't build sqlite as threadsafe if we are doing an NTS build 2009-08-10 16:58:53 +00:00
Felipe Pena
cdf9cf3033 - Fixed bug #48773 (Incorrect error when setting PDO::ATTR_STATEMENT_CLASS with ctor_args)
[HEAD only]
2009-07-19 18:55:31 +00:00
Ilia Alshanetsky
b683c61e60 MFB: Re-introduce the Matteo's patch and combine default & text handling
since they appear to be the same irregardless on notes inside sqlite3.h
2009-05-20 15:05:36 +00:00