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
76,597 Commits 494 Branches 1,367 Tags 801 MiB
74ab30e216
Commit Graph

394 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