Commit Graph

444 Commits

Author SHA1 Message Date
Rasmus Lerdorf
1ce00048fd Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fix unitialized opened_path here - found by Coverity
2013-10-19 19:25:25 -07:00
Rasmus Lerdorf
2be67ca457 Fix unitialized opened_path here - found by Coverity 2013-10-19 19:24:17 -07:00
Adam Harvey
a92a350cce Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Copy dba_*() keys before converting to string.
2013-09-22 16:52:41 -07:00
Adam Harvey
30e0442c54 Copy dba_*() keys before converting to string.
A nice Sunday afternoon project for somebody would be to refactor the dba
functions to use zend_parse_parameters() reliably and try to untangle some of
the macros in dba.c. Sadly, it is not a nice Sunday afternoon here.

Fixes bug #65708 (dba functions cast $key param to string in-place, bypassing
copy on write).
2013-09-22 16:46:17 -07:00
Christopher Jones
9ad97cd489 Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings. 2013-08-14 20:36:50 -07: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
Veres Lajos
e9a95d78ef typo fixes 2013-07-15 00:23:03 -07:00
Veres Lajos
72085b0e5f typo fixes 2013-07-15 00:18:57 -07:00
Felipe Pena
aa31d7e1ef Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  - Fixed bug #63409 (php-dba function test fails on big-endian machine) patch by: tianhonglouis at gmail dot com
2013-06-26 13:50:43 -03:00
Felipe Pena
7e33b5d2fa - Fixed bug #63409 (php-dba function test fails on big-endian machine) patch by: tianhonglouis at gmail dot com 2013-06-26 13:50:37 -03: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
David Soria Parra
f92a15864b Remove unused variable 2013-03-27 20:00:54 +01:00
Lars Strojny
eb40f73ca0 Bug #62489: dba_insert not working as expected 2013-01-15 09:30:44 +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
e3aad69ccc Fix inifile.c:419:6: warning: variable 'ret' set but not used [-Wunused-but-set-variable]
Please check this minor change.

Avoid, warning: 'pos_grp_start' may be used uninitialized in this function [-Wmaybe-uninitialized]
2012-12-03 13:38:12 +01:00
Remi Collet
869e6508b3 use php_stream_copy_to_stream_ex instead of deprecated php_stream_copy_to_stream 2012-12-03 13:35:26 +01:00
Xinchen Hui
e081c55fb5 Merge branch 'PHP-5.3' into PHP-5.4 2012-10-10 10:31:31 +08:00
Xinchen Hui
610c7fbe7b Remove executable permission on phpt 2012-10-10 10:27:49 +08:00
Xinchen Hui
e4a8fa6a15 Merge branch 'PHP-5.3' into PHP-5.4 2012-10-09 13:29:51 +08:00
Xinchen Hui
6284ef112e Fixed bug #63236 (Executable permission on various source files) 2012-10-09 13:28:31 +08:00
Xinchen Hui
9d44ff640c Merge branch 'PHP-5.3' into PHP-5.4
Conflicts:
	ext/interbase/interbase.rc
2012-09-05 23:11:19 +08:00
Xinchen Hui
d64d9e3351 year++ 2012-09-05 23:08:05 +08:00
David Soria Parra
c918ca57a7 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Replace $Revision$ with $Id$ in keyword expansion enable files
  Enable $Id$ expansion for files with the $Revision$ keyword

Conflicts:
	ext/mysqlnd/mysqlnd.h
2012-03-20 17:58:58 +01:00
David Soria Parra
f7b10abae9 Replace $Revision$ with $Id$ in keyword expansion enable files 2012-03-20 17:53:47 +01: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
Felipe Pena
2568672691 - We can constify in 5.4+ 2011-11-15 12:34:59 +00:00
Christopher Jones
83ee110360 Prevent the magic quotes fatal error causing a diff 2011-09-01 19:01:37 +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
Pierre Joye
9805e1674a - remove magic quotes support, functions are kept (see the NEWS entry for the details) for BC reasons but do not allow to set enable MQ 2011-07-22 11:25:30 +00:00
Christopher Jones
0c2ee427d7 Keep the DBA DB4 test status quo after Berkeley DB 5.2 introduced error message prefixes 2011-06-27 22:58:59 +00:00
Christopher Jones
eb9093160f Keep the DBA DB4 test status quo after Berkeley DB 5.2 introduced error message prefixes 2011-06-27 22:58:59 +00:00
Hannes Magnusson
e788932a91 Fix 5.1 detection on ubuntu natty 2011-06-27 20:28:30 +00:00
Hannes Magnusson
2310029923 Fix 5.1 detection on ubuntu natty 2011-06-27 20:28:30 +00:00
Felipe Pena
2b8d0edb45 - Fix infile return on duplicated key (related to bug #54242) 2011-03-17 11:43:05 +00:00
Felipe Pena
cedd0a7224 - Fix infile return on duplicated key (related to bug #54242) 2011-03-13 14:57:19 +00:00
Felipe Pena
5500c1cc17 - Fixed bug #54242 (dba_insert returns true if key already exists) 2011-03-13 14:21:58 +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
Ilia Alshanetsky
399182de3f Fixed compiler warnings 2010-12-20 23:00:11 +00:00
Ilia Alshanetsky
c9459ed7e7 Fixed compiler warnings 2010-12-20 23:00:11 +00:00
Christopher Jones
2024790fd2 Add Berkeley DB 5.1 support to the DBA extension 2010-12-01 19:20:16 +00:00
Christopher Jones
17b31ae362 Add Berkeley DB 5.1 support to the DBA extension 2010-12-01 19:20:16 +00:00
Kalle Sommer Nielsen
a448b6a72b MFB53: Changed deprecated ini options on startup from E_WARNING to E_DEPRECATED (Fixes #52570)
# Some of the updated tests were to make them sync with 5.3 although they don't run on trunk anymore
2010-08-11 21:41:30 +00:00
Kalle Sommer Nielsen
8deefa8780 Changed deprecated ini options on startup from E_WARNING to E_DEPRECATED (Fixes #52570)
# Trunk patch will follow shortly
2010-08-11 21:12:18 +00:00
Christopher Jones
442fa8dc1b Explicitly use db-5.0 and don't default to db sym link 2010-06-09 17:33:44 +00:00
Christopher Jones
afedcbbd1d Explicitly use db-5.0 and don't default to db sym link 2010-06-09 17:33:44 +00:00
Christopher Jones
9ef6a73dee Add Berkeley DB 5 support. (An outstanding issue with BDB 4.8 related to 51086 that also affects BDB 5 is not yet resolved) 2010-06-03 07:03:05 +00:00
Christopher Jones
e524236afa Add Berkeley DB 5 support. (An outstanding issue with BDB 4.8 related to 51086 that also affects BDB 5 is not yet resolved) 2010-06-03 07:03:05 +00:00
Rob Richards
0a34d10783 revert change #298288: Remove old dsp/dsw/makefile files 2010-04-28 14:41:51 +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
Kalle Sommer Nielsen
518a17e7bf Remove old dsp/dsw/makefile files, these arent used by the build system anymore and are barely updated nor available for all extensions 2010-04-21 23:36:49 +00:00
Michael Maclean
e52fa0027b Add Tokyo Cabinet abstract DB support to ext/dba 2010-03-24 23:38:59 +00:00
Christopher Jones
ad0e1ae3f1 New tests for existing functionality 2010-03-19 22:15:40 +00:00
Christopher Jones
321ca32642 New and improved DBA tests 2010-03-12 00:27:57 +00:00
Christopher Jones
09df605181 Mask name of older DB4 versions 2010-03-09 18:06:20 +00:00
Christopher Jones
aa60f8e807 Test misc argument error conditions 2010-03-06 00:23:16 +00:00
Christopher Jones
f3ad58a8a0 Fixed bug #51086 (DBA DB4 doesn't work with Berkeley DB 4.8) 2010-03-05 06:45:28 +00:00
Christopher Jones
db7843bbac Auto detect recent versions of Berkeley DB4 2010-03-05 05:23:01 +00:00
Christopher Jones
7b329d5afc DBA tests: cleanup and sycn. Add new Berkeley DB 4 tests 2010-03-05 00:23:26 +00:00
Felipe Pena
f0587e8086 - Possible fix for bug #50999 2010-03-03 00:29:38 +00:00
Christopher Jones
40348f1a5b make portable 2010-03-02 17:00:18 +00:00
William Martin
acc80f0fc3 Added SKIP sections in case extension isn't enabled 2010-03-02 13:21:25 +00:00
Christopher Jones
a3ec3b003d Improve basic code coverage 2010-03-01 20:33:18 +00:00
Sebastian Bergmann
9ba1e81665 sed -i "s#1997-2009#1997-2010#g" **/*.c **/*.h **/*.php 2010-01-03 09:23:27 +00:00
Dmitry Stogov
7bfe056174 Fixed tests 2009-09-21 09:52:19 +00:00
Felipe Pena
96d24a59e5 - Fixed paths 2009-08-01 23:26:02 +00:00
Felipe Pena
085067a9aa - Fixed bug #49125 (Error in dba_exists C code)
patch by: jdornan at stanford dot edu
2009-08-01 23:10:11 +00:00
Ilia Alshanetsky
34842709d6 Fixed test 2009-06-16 12:40:59 +00:00
Felipe Pena
539b7a2154 - MFH: Fixed bug #48240 (DBA Segmentation fault dba_nextkey) 2009-05-13 02:14:53 +00:00
Sebastian Bergmann
08659c2dcd MFH: Bump copyright year, 3 of 3. 2008-12-31 11:15:49 +00:00
Hannes Magnusson
f6cf54d2b1 Fixed bug#46847 (phpinfo() is missing some settings.) 2008-12-12 13:07:28 +00:00
Felipe Pena
fc2fb50d09 - MFH: Added 'static' into ZEND_BEGIN_ARG_INFO_EX macro 2008-11-17 11:28:01 +00:00
Ilia Alshanetsky
9c9b5b3925 Fixed a bug inside dba_replace() that could cause file truncation with
invalid keys
2008-11-13 18:21:40 +00:00
Alexey Zakhlestin
deb420ee63 new parameter-parsing API 2008-11-07 12:39:11 +00:00
Felipe Pena
7a37fa2d6b - Revert ZEND_BEGIN_ARG_INFO change 2008-11-02 21:19:39 +00:00
Felipe Pena
df10005563 - MFH: Added 'static' into ZEND_BEGIN_ARG_INFO_EX macro 2008-10-24 14:35:40 +00:00
Christopher Jones
2bb7df3504 MFH:
Fix bug #45266 (Fix build with BDB 4)
Fix bug #45267 (Revert invalid assumption about BDB 4 locking; let DBA handle locking)
Fix bug #45268 (Fix error callback prototype)
2008-06-19 22:39:56 +00:00
Felipe Pena
84a8bb038a MFH: New way for check void parameters 2008-03-10 22:15:36 +00:00
Sebastian Bergmann
d1dded8751 MFH: Bump copyright year, 2 of 2. 2007-12-31 07:17:19 +00:00
Marcus Boerger
d309efd945 - More about 4.6 2007-12-06 14:01:49 +00:00
Marcus Boerger
1f623c4965 Add db 4.6 to detect list 2007-12-06 13:53:38 +00:00
Dmitry Stogov
6c810b0d4c Improved memory usage by movig constants to read only memory. (Dmitry, Pierre) 2007-09-27 18:00:48 +00:00
Jani Taskinen
09d9338040 MFH:- Fixed bug #41433 (DBA: configure fails to include correct db.h for db4) 2007-07-19 10:50:16 +00:00
Jani Taskinen
ad61002dc4 MFH: fix wrong logic 2007-07-13 15:09:19 +00:00
Jani Taskinen
9d53e19697 MFH: cleanups + fixes 2007-07-13 14:23:59 +00:00
Antony Dovgal
007bac315d MFH: fix #41455 (ext/dba/config.m4 pollutes global $LIBS and $LDFLAGS) 2007-05-21 11:38:53 +00:00
Antony Dovgal
1f65545121 fix test names 2007-05-07 18:03:01 +00:00
Antony Dovgal
bb489851e9 win32 test fixes 2007-04-18 08:06:29 +00:00
Marcus Boerger
a4bf33f02d - MFH Fix warning 2007-04-14 11:15:13 +00:00
Ilia Alshanetsky
18548c1041 fixed compiler warnings 2007-01-01 19:40:29 +00:00
Sebastian Bergmann
4223aa4d5e MFH: Bump year. 2007-01-01 09:36:18 +00:00
Ilia Alshanetsky
9a1abfbb7d Revert previous patch and it breaks builds with built-in cdb lib 2006-12-05 17:54:52 +00:00
Ilia Alshanetsky
9666f1deae Config fix from Gentoo 2006-12-03 19:54:55 +00:00
Antony Dovgal
5a6c11d9f4 MFH: fix #39653 (ext/dba doesn't check for db-4.5 and db-4.4 when db4 support is enabled) 2006-11-28 11:39:19 +00:00
Marcus Boerger
2820e9cf1e - MFH: Fixed bug #38698 2006-11-03 19:00:46 +00:00
Hannes Magnusson
050f94f746 MFH: Fix double "wron param count" messages 2006-11-03 14:46:48 +00:00