Commit Graph

378 Commits

Author SHA1 Message Date
Stanislav Malyshev
ac40c0b562 Merge branch 'pull-request/341'
* pull-request/341: (23 commits)
  typofixes
2013-06-10 14:20:18 -07:00
Xinchen Hui
0a7395e009 Happy New Year 2013-01-01 16:28:54 +08: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