clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-24 11:27:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
71,271 Commits 491 Branches 1,363 Tags 847 MiB
75f6c8d42c
Commit Graph

7031 Commits

Author SHA1 Message Date
Xinchen Hui
75f6c8d42c Revert "zend_make_printable_zval choses cast_object over __toString" 
This reverts commit a5dfd41494.
 2012-08-12 12:02:06 +08:00
Xinchen Hui
32c1c5a19f Revert "Test for bug 62328" 
This reverts commit 222ab9da1a.
 2012-08-12 12:02:02 +08:00
Xinchen Hui
d11fa44d62 Merge branch 'Bug-62328' of https://github.com/leight/php-src 2012-08-12 10:40:41 +08:00
Leigh
222ab9da1a Test for bug 62328 2012-08-10 11:43:53 +01:00
Leigh
a5dfd41494 zend_make_printable_zval choses cast_object over __toString 
https://bugs.php.net/bug.php?id=62328

Added a check to see if the object implements a __toString magic
method. This should be called instead of the cast_object method of
built-in classes when defined.
 2012-08-10 11:09:25 +01:00
Stanislav Malyshev
04ac5065e0 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Added Bison 2.5.1 to bison_version_list
 2012-08-05 20:48:47 -07:00
Ryusuke SEKIYAMA
81c6a060a2 Added Bison 2.5.1 to bison_version_list 2012-08-05 20:48:42 -07:00
Xinchen Hui
ac88d108e6 Merge branch 'PHP-5.4' 2012-08-04 11:29:56 +08:00
Xinchen Hui
d289efb457 Merge branch 'PHP-5.3' into PHP-5.4 
Conflicts:
	Zend/zend_API.h
 2012-08-04 11:14:03 +08:00
Xinchen Hui
03a1fcabf3 Fixed bug #62744 (dangling pointers made by zend_disable_class) 
the test will be added while commit the fix for #62737
 2012-08-04 10:41:26 +08:00
Nuno Lopes
aa8eabddd6 make default_exception_ce and error_exception_ce static 2012-08-02 06:53:09 -04:00
Nuno Lopes
81369bcc20 make default_exception_ce and error_exception_ce static 2012-08-02 11:44:15 +01:00
Xinchen Hui
6c7c2d0c03 Merge branch 'PHP-5.4' 2012-08-02 12:34:15 +08:00
Xinchen Hui
242658c053 Merge branch 'PHP-5.3' into PHP-5.4 2012-08-02 12:32:44 +08:00
Xinchen Hui
433089ccb4 Fixed bug #62716 (munmap() is called with the incorrect length) 2012-08-02 12:30:07 +08:00
Xinchen Hui
b412df1e67 Merge branch 'PHP-5.4' 2012-07-31 10:52:26 +08:00
Xinchen Hui
572d6437bc expect pass for 5.4 2012-07-31 10:51:18 +08:00
Xinchen Hui
c730329bb0 Merge branch 'PHP-5.3' into PHP-5.4 2012-07-31 10:51:04 +08:00
Xinchen Hui
645f84e41b Test for bug #62680 2012-07-31 10:49:13 +08:00
Xinchen Hui
32c05f772e Merge branch 'PHP-5.4' 
* PHP-5.4:
  Skip test while zend_mm is disabled
 2012-07-29 12:20:05 +08:00
Xinchen Hui
11e84180ef Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Skip test while zend_mm is disabled
 2012-07-29 12:19:28 +08:00
Xinchen Hui
015ee3b2c8 Skip test while zend_mm is disabled 2012-07-29 12:17:43 +08:00
Xinchen Hui
b477a84026 Fixed bug #60194 for eavl 
same reason here
 2012-07-28 17:00:05 +08:00
Xinchen Hui
ef7286a42f Fixed bug #60194 (--with-zend-multibyte and --enable-debug reports LEAK with run-test.php) 
It's not a big deal, just because lexer will read the char after cursor before leaving
 2012-07-28 00:50:45 +08:00
Gustavo André dos Santos Lopes
594397993d Fix bug #62651: source level BC break 
Break for C++ extensions that don't wrap the includes of PHP libraries
in extern "C" {.
 2012-07-27 01:39:06 +02:00
Gustavo André dos Santos Lopes
ccffec74d0 Fix bug #62651: source level BC break 
Break for C++ extensions that don't wrap the includes of PHP libraries
in extern "C" {.
 2012-07-26 23:37:02 +02:00
Xinchen Hui
80497ea7df Merge branch 'PHP-5.4' 2012-07-26 13:58:01 +08:00
Xinchen Hui
302ad0d648 Fix test, committed in wrong folder 2012-07-26 13:57:04 +08:00
Xinchen Hui
eae0610042 Fixed bug #62653: (unset($array[$float]) causes a crash) 
the reason why jpauli and I can not reproduce is (it's silly):
I typo "USE_ZEND_ALLOC *&&* valgrind" at the first time, then I always ctrl+r
and jpauli copied my command from the pastbin :)

thanks
 2012-07-26 13:53:06 +08:00
Xinchen Hui
07c61c2fdb Merge branch 'PHP-5.4' 2012-07-26 12:44:51 +08:00
Xinchen Hui
b4b3a65f55 Fixed bug #62661 (Interactive php-cli crashes if include() is used in auto_prepend_file) 2012-07-26 12:40:47 +08:00
Xinchen Hui
ba568aaebb Fixed invalid read in CONST_STRING dereference, reported by Nikic 2012-07-26 00:29:39 +08:00
Stanislav Malyshev
efdb7ce4b0 improve code in zend_operators 2012-07-14 21:06:40 -07:00
Stanislav Malyshev
bd340b7296 add NEWS/UPGRADING 2012-07-14 15:03:51 -07:00
Stanislav Malyshev
c164e6b5a3 add test 2012-07-14 14:50:50 -07:00
Stanislav Malyshev
582514d4c7 fix for bug#18556 - use simple tolower() function for internal things 2012-07-14 14:50:50 -07:00
Nuno Lopes
b2b018d5f7 appease MSVC (doesnt like unary minus of unsigned ints) 2012-07-08 15:28:29 -04:00
Nuno Lopes
5910d8d4f4 appease MSVC (doesnt like unary minus of unsigned ints) 2012-07-08 15:21:18 -04:00
Nuno Lopes
e6d9cd983b appease MSVC (doesnt like unary minus of unsigned ints) 2012-07-08 15:19:41 -04:00
Nuno Lopes
91ce8041a3 fix (signed) integer overflow (part of bug #52550 2012-07-02 01:36:35 -04:00
Nuno Lopes
d80ff39189 fix (signed) integer overflow (part of bug #52550 2012-07-02 01:35:28 -04:00
Nuno Lopes
f2bf98a589 fix (signed) integer overflow (part of bug #52550 2012-07-02 01:31:40 -04:00
Stanislav Malyshev
a3322f8927 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed the common misspelling of the word occurred (occured -> occurred)
 2012-06-30 17:00:25 -07:00
Marc Easen
896ac689c9 Fixed the common misspelling of the word occurred (occured -> occurred) 2012-06-30 16:54:03 -07:00
Xinchen Hui
a027ba3afe Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed bug #62357 (compile failure: (S) Arguments missing for built-in function __memcmp).
 2012-06-26 18:50:52 +08:00
Xinchen Hui
a44a1dc194 Fixed bug #62357 (compile failure: (S) Arguments missing for built-in function __memcmp). 
Any C library function may be a macro, We should avoid using ZEND_STRS(L) as their arguments
 2012-06-26 18:42:33 +08:00
Johannes Schlüter
7d900356e9 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Remove unneeded and outdated ChangeLog file
 2012-06-22 20:01:27 +02:00
Johannes Schlüter
2418791731 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Remove unneeded and outdated ChangeLog file
 2012-06-22 20:01:06 +02:00
Johannes Schlüter
84b1c568f4 Remove unneeded and outdated ChangeLog file 2012-06-22 20:00:20 +02:00
Stanislav Malyshev
d1debecd90 typo 2012-06-08 12:24:40 -07:00