clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 02:47:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
96,453 Commits 491 Branches 1,363 Tags 841 MiB
2198d38cbc
Commit Graph

460 Commits

Author SHA1 Message Date
Xinchen Hui
f9c3d09f1c Fixed tests but introduce segfaults (behavior same as trunk) 2014-05-21 23:11:02 +08:00
Xinchen Hui
96617874bd Fixed persistent dba handling 2014-05-21 12:22:59 +08:00
Xinchen Hui
6d12d3bae1 Refactored ext/dba (tests passes, but segfaults need to be fixed) 2014-05-21 11:40:19 +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
Dmitry Stogov
050d7e38ad Cleanup (1-st round) 2014-04-15 15:40:40 +04:00
Nikita Popov
1aa6f95651 Merge branch 'PHP-5.6' 2014-02-16 00:08:17 +01:00
Rouven Weßling
417dbfbacc Declare a number of functions as variadic. 2014-02-16 00:07:55 +01:00
Xinchen Hui
0f53e37494 Merge branch 'PHP-5.6' 2014-01-03 11:09:07 +08: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
Michael Wallner
5a420c8680 fix bug #62490 
inifiles delete handler did not return false if the key was not found
 2013-12-05 11:04:25 +01:00
Michael Wallner
f0c85fab45 more test fixes 2013-12-03 18:18:40 +01:00
Michael Wallner
b0415856fd fix test 2013-12-03 17:55:26 +01:00
Michael Wallner
9e309a2d10 fix php_stream_copy_to_stream_ex usage 2013-12-03 17:55:18 +01:00
Michael Wallner
a7f0465c0b add missing clean section 2013-12-03 17:07:40 +01:00
Michael Wallner
f4912e3a96 remove test for already removed feature 2013-12-03 16:57:35 +01:00
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