clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-02 23:36:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,105 Commits 494 Branches 1,367 Tags 809 MiB
5f6bed180e
Commit Graph

49105 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anatoliy Belsky
5f6bed180e Fix bug #61412 ext\openssl\tests\bug28382.phpt fails 2012-03-27 15:23:01 +02:00
Pierre Joye
d0e3289d12 - fix test for 5.11 2012-03-27 14:01:38 +02:00
Pierre Joye
12cf930a40 Fix bug #61504, potential vuln. in fileinfo. update to 5.11 2012-03-27 13:34:46 +02:00
Stanislav Malyshev
bc313f5e80 Merge branch 'grapheme_fix' into PHP-5.3 
* grapheme_fix:
  fix bug #61487 - bad bounds check in grapheme_strpos
 2012-03-25 01:03:02 -07:00
Stanislav Malyshev
4c478f9ca6 NEWS for bug #61487 2012-03-25 00:57:08 -07:00
Stanislav Malyshev
cd9cd36d7e fix bug #61487 - bad bounds check in grapheme_strpos 2012-03-25 00:56:38 -07:00
Pierrick Charron
da2da13f93 Remove unused variable 2012-03-24 17:49:58 -04:00
Hannes Magnusson
948d326b29 Fix test on FreeBSD and other systems that have /etc/services 2012-03-24 17:58:40 +01:00
Hannes Magnusson
4fc4dd8760 This is a git checkout 2012-03-24 17:16:50 +01:00
Ilia Alshanetsky
8d0760f38a Revert incorrect fix 2012-03-24 12:27:55 -04:00
David Soria Parra
cb54532b7f Merge commit '521ebec3e9bcd4fa75772d2bfa57a733dfe1d5fa' into PHP-5.3 
This merge combines a accidentaly separated head, leading to two duplicated
commits in history (again).

* commit '521ebec3e9bcd4fa75772d2bfa57a733dfe1d5fa':
  Revert "Implemented FR #60738 (Allow 'set_error_handler' to handle NULL)"
 2012-03-24 14:38:03 +01:00
Xinchen Hui
521ebec3e9 Revert "Implemented FR #60738 (Allow 'set_error_handler' to handle NULL)" 
This reverts commit fcae164ea6.
 2012-03-24 19:29:56 +08:00
Xinchen Hui
9c99a89e8e Revert "Implemented FR #60738 (Allow 'set_error_handler' to handle NULL)" 
This reverts commit fcae164ea6.
 2012-03-24 19:26:02 +08:00
Xinchen Hui
2d21149743 Revert "Merge from PHP-5.4" 
This reverts commit 9a87fe1c52.
 2012-03-24 19:25:21 +08:00
Xinchen Hui
fcae164ea6 Implemented FR #60738 (Allow 'set_error_handler' to handle NULL) 2012-03-24 15:13:10 +08:00
Xinchen Hui
9a87fe1c52 Merge from PHP-5.4 
Improve set_exception_handler
 2012-03-24 14:33:00 +08:00
Xinchen Hui
56dac369ab Fix ZTS build 2012-03-24 14:22:04 +08:00
Gustavo André dos Santos Lopes
f514856fbb Merge branch 'dom_debug_handler' into 5.3 2012-03-23 22:14:24 +00:00
Gustavo André dos Santos Lopes
15d7d460bd Updated NEWS (DOM object debug info handler). 2012-03-23 22:13:26 +00:00
Gustavo André dos Santos Lopes
372801d94c Fixed tests that var_dump/print_r DOM objects. 2012-03-23 22:08:33 +00:00
Gustavo André dos Santos Lopes
b61017c9b6 Improved on DOM object debug info handler. Added test. 2012-03-23 21:23:24 +00:00
Joey Smith
d04682766d Added DOM Debug handler 2012-03-23 21:23:23 +00:00
Gustavo André dos Santos Lopes
3960def881 Fixed bug #61482, caused by the fix to bug #61418. 
Turns out I'd forgotten to also update the destructor for the iterator
returned by DirectoryIterator.
The iterator for DirectoryIterator maintains the same ->current pointer
throughout its existence (the DirectoryIterator itself) and returns it
(the same object) everytime a value is requested from the iterator.
Moving forward the iterator only changes the object. Previous code
added two references to the object in get_iterator on the account of
1) the iterator memory living in its DirectoryIterator object and
2) the object being stored in iterator->current. This seems to be
unnecessary. Iterators are not responsible for incrementing the refcount
of the values they yield, that's up to the caller (the engine). What
matters for the iterator is that the object exists as long as the
iterator exists and this can be guaranteed by incremented the refcount
only once. Consequently, I only add one reference in get_iterator
(and reclaim it in the iterator destructor).
 2012-03-23 11:19:19 +00:00
Gustavo André dos Santos Lopes
85725337d5 Revert "Revert "- Fixed bug #61418 (Segmentation fault when DirectoryIterator's or" - causes bug #61482" 
This reverts commit a89c4a34ee.
 2012-03-23 09:40:27 +00:00
Gustavo André dos Santos Lopes
e8ecb11449 Revert "revert from NEWS too" 
This reverts commit 4990250f2d.
 2012-03-23 09:40:20 +00:00
Stanislav Malyshev
4990250f2d revert from NEWS too 2012-03-22 22:34:32 -07:00
Stanislav Malyshev
a89c4a34ee Revert "- Fixed bug #61418 (Segmentation fault when DirectoryIterator's or" - causes bug #61482 
This reverts commit 714f1ff4b3.
 2012-03-22 22:29:50 -07:00
Christopher Jones
7164175e85 Add initialization tests for SQLT_INT binds 
Added tests for SQLT_INT binds particularly to check for uninitialized
variables.
 2012-03-22 13:24:46 -07:00
Johannes Schlüter
1a0b0ead14 Fix NEWS 2012-03-22 16:40:13 +01:00
Ilia Alshanetsky
b4aea52682 Fixed bug #61423 (gzip compression fails). 2012-03-22 09:13:45 -04:00
Dmitry Stogov
672fe54a00 Revert "Fixed reference counting" 
This reverts commit 14af1fe692.
 2012-03-22 15:51:58 +04:00
Dmitry Stogov
14af1fe692 Fixed reference counting 2012-03-22 15:03:16 +04:00
Xinchen Hui
523396cb28 Fix test, and merge the modification from trunk 2012-03-22 17:30:16 +08:00
Xinchen Hui
27208de763 Ignore the tempoary files 2012-03-22 17:22:17 +08:00
Xinchen Hui
e96a172114 Fix test, which was broken by the fix for #61173 2012-03-22 17:10:03 +08:00
Gustavo André dos Santos Lopes
cdc5d4a801 Merge branch 'PHP-5.3' of git.php.net:/php-src into 5.3 2012-03-21 21:13:35 +00:00
Gustavo André dos Santos Lopes
2d2995f343 Fixed bug #61043: Regression in magic_quotes_gpc fix (CVE-2012-0831) 
Merge commit 'refs/pull/12/head' of git://github.com/php/php-src into 5.3

Signed-off-by: Gustavo André dos Santos Lopes <cataphract@php.net>
 2012-03-21 21:12:31 +00:00
David Soria Parra
ca797ca31e Use the NEWS merge driver if available 
As described in https://wiki.php.net/vcs/gitworkflow#the_news_file it
is possible to setup a custom merge driver for NEWS so git doesnt try
to merge it.  This commit sets the default merge driver for the NEWS
file to the merge driver called NEWS.
 2012-03-21 18:11:41 +01:00
Dmitry Stogov
657547f8c4 Fixed bug #49853 (Soap Client stream context header option ignored) 2012-03-21 16:32:49 +04:00
David Soria Parra
944e622821 Always keep the NEWS file from the branch when merging 
We usually don't want to touch the NEWS files when we merge and have the
news items not merged by git. Therefore we tell git to use the 'ours' strategy
for the NEWS file.
 2012-03-21 12:38:43 +01:00
Ondřej Surý
d1fd5432e1 Fixed bug #61043 (Regression in magic_quotes_gpc fix for CVE-2012-0831) 2012-03-21 08:44:59 +01:00
Pierre Joye
fda25d97ff - update NEWS 2012-03-21 07:06:07 +01:00
Pierre Joye
baeaafd395 - add test for bug #55000 and #54374 2012-03-21 07:00:22 +01:00
Pierre Joye
95dcd799fb - merge fix bug #54374, bug #55500 - filter file names better, no dangling [s, svn revision 321664 2012-03-21 06:58:55 +01:00
Stanislav Malyshev
cb4e82a1cc adapt makedist to git 2012-03-20 10:02:00 -07:00
David Soria Parra
f7b10abae9 Replace $Revision$ with $Id$ in keyword expansion enable files 2012-03-20 17:53:47 +01:00
David Soria Parra
eb8812e58b Enable $Id$ expansion for files with the $Revision$ keyword 
Git supports a limited $Id$ keyword expansion. This $Id$ tag is similar to
$Revision$ in SVN. We enable the $Id$ expansion only for files that use
$Revision$.
 2012-03-20 17:49:42 +01:00
Matt Nowack
76ef76d2f8 Adding Braces in json.c to conform with coding standards 2012-03-20 17:29:04 +01:00
Xinchen Hui
7aa2b75db2 Ignore the temporay files in sapi/*/tests/ 2012-03-20 17:20:15 +08:00
Christopher Jones
4a6d9b348f Minor text changes (to try new git repo) 2012-03-19 15:16:33 -07:00