clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-24 19:37:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
72,407 Commits 493 Branches 1,365 Tags 848 MiB
d5c2da5756
Commit Graph

72407 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitry Stogov
d5c2da5756 Removed unreachable code 2012-12-13 17:51:04 +04:00
Dmitry Stogov
438cd86378 Removed unnecessary checks 2012-12-13 17:29:30 +04:00
Dmitry Stogov
ff1e1d7a8e Removed redundand checks from release build 2012-12-13 14:46:44 +04:00
Dmitry Stogov
4b1b115633 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #63757 (getenv() produces memory leak with CGI SAPI)

Conflicts:
	NEWS
 2012-12-13 13:40:42 +04:00
Dmitry Stogov
35f86d24d8 Fixed bug #63757 (getenv() produces memory leak with CGI SAPI) 2012-12-13 13:39:42 +04:00
Xinchen Hui
4d2593e1be Merge branch 'PHP-5.4' into PHP-5.5 2012-12-13 10:45:33 +08:00
Xinchen Hui
1f516510b7 Merge branch 'PHP-5.3' into PHP-5.4 2012-12-13 10:44:56 +08:00
Xinchen Hui
39a3007ab2 MFH 2012-12-13 10:44:14 +08:00
Dmitry Stogov
6fd8b65cfb Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 
* 'PHP-5.5' of git.php.net:php-src:
  Really fix test pdo_mysql_class_constants.phpt
 2012-12-13 02:53:27 +04:00
Dmitry Stogov
6b0b4bf8eb An exception thrown in try or catch block is disacarded by return statement in finally block. 2012-12-13 02:48:51 +04:00
Remi Collet
6e4cfa18f7 Really fix test pdo_mysql_class_constants.phpt 
- with mysqlnd, constant always present
- with mysqli, check client library version
- without mysqlnd and without mysqli
	skip the test if no connection
	use connection to check client library

Note : MySQLPDOTest::getClientVersion() is broken with mysqlnd
as PDO::ATTR_CLIENT_VERSION return "mysqlnd 5.0.11-dev - 20120503..."
so, getClientVersion() return "11"
 2012-12-12 16:53:18 +01:00
Dmitry Stogov
9c96fe52d9 Restored proper generators behaviour in conjunction with "finally". (Nikita) 2012-12-12 17:47:55 +04:00
Remi Collet
4d8d5d83fc Fixed Bug #63738 unpack: back result with Z format 
Fix result for empty string.
Same output as perl
perl -e 'print unpack("Z2","\0\0");' => ""
perl -e 'print unpack("Z2","A\0");'  => "A"
perl -e 'print unpack("Z2","AB\0");' => "AB"
perl -e 'print unpack("Z2","ABC\0");'=> "AB"
 2012-12-11 16:30:08 +01:00
Dmitry Stogov
a9a5f7aca6 - generators API exported for extensions 
- improved RETURN sequence to avoid redundant check if op_array is a generator
 2012-12-11 17:25:32 +04:00
Adam Harvey
8bb106d20c Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Alter php_json_decode_ex() to respect JSON_BIGINT_AS_STRING for bare numbers.
 2012-12-11 19:53:02 +08:00
Adam Harvey
2d1694d4eb Alter php_json_decode_ex() to respect JSON_BIGINT_AS_STRING for bare numbers. 
Fixes bug #63737 (json_decode does not properly decode with options parameter).
 2012-12-11 19:51:30 +08:00
Adam Harvey
ec83534d88 Tinker with the wording of the MySQL deprecation news post. 
I know that in general NEWS is a very punchy "this is what happened" log, but
Chris e-mailed me off-list to ask if it could be added to avoid any FUD — this
merely brings the NEWS post into line with UPGRADING, the migration guide, and
every other piece of advice we're giving out.

I also forgot to add the RFC URL last night, so added that.
 2012-12-11 09:08:07 +08:00
Adam Harvey
b7091aaf01 Deprecate ext/mysql. 
Per https://wiki.php.net/rfc/mysql_deprecation, connecting to a MySQL database
via ext/mysql now generates an E_DEPRECATED error. This commit includes the
minimal EXPECTF updates required for the test suite to pass: it may be
preferable to refactor some of the tests to suppress deprecation errors in
situations where no other error is expected from mysql_[p]connect(), but I'm
not enough of a MySQL expert to want to get my hands that dirty in a long
standing test suite.
 2012-12-10 22:12:09 +08:00
Johannes Schlüter
c007ba4740 Merge branch 'PHP-5.4' into PHP-5.5 2012-12-10 13:36:05 +01:00
Johannes Schlüter
95fd52ff3d Merge branch 'PHP-5.3' into PHP-5.4 2012-12-10 13:35:57 +01:00
Johannes Schlüter
a2cf4f1932 Merge branch 'PHP-5.3' of git.php.net:/php-src into PHP-5.3 2012-12-10 13:35:27 +01:00
Johannes Schlüter
1aba46081a Merge branch 'PHP-5.4' into PHP-5.5 2012-12-10 13:34:23 +01:00
Johannes Schlüter
bd36d4901c Merge branch 'PHP-5.3' into PHP-5.4 2012-12-10 13:32:50 +01:00
Johannes Schlüter
795e3f1c0f Fix typo 2012-12-10 13:32:08 +01:00
Xinchen Hui
70b65f3100 Merge branch 'PHP-5.4' into PHP-5.5 2012-12-10 20:30:39 +08:00
Xinchen Hui
3d86e6d881 Fixed bug #63726 (Memleak with static properties and internal/user classes) 
No test scripts provided (will try to find one)
 2012-12-10 20:29:51 +08:00
Xinchen Hui
8b8fb649dc Merge branch 'PHP-5.3' into PHP-5.4 2012-12-10 20:29:38 +08:00
Xinchen Hui
ad553a7af2 Fixed bug #63726 (Memleak with static properties and internal/user classes) 2012-12-10 20:28:27 +08:00
Xinchen Hui
a1e401fb34 Merge branch 'PHP-5.3' into PHP-5.4 2012-12-10 18:47:53 +08:00
Xinchen Hui
db6d8e2724 skip 32-bit OS 2012-12-10 18:47:21 +08:00
Xinchen Hui
4e7db3ecbc Merge branch 'PHP-5.4' into PHP-5.5 2012-12-10 18:35:04 +08:00
Xinchen Hui
2a75f59355 Merge branch 'PHP-5.3' into PHP-5.4 2012-12-10 18:29:34 +08:00
Xinchen Hui
d86decd7b4 Merge branch 'PHP-5.3' of git.php.net:php-src into PHP-5.3 2012-12-10 18:28:26 +08:00
Xinchen Hui
fa7e230c76 Need more that 2G memory 2012-12-10 18:28:01 +08:00
Sebastian Bergmann
16ec6fa206 Cleanup NEWS 2012-12-06 11:03:37 +01:00
Dmitry Stogov
e3b2a5cf74 Generatirs are going to be used less than regular functions 2012-12-06 13:14:31 +04:00
Sebastian Bergmann
8ca4288fd2 Leftover: Invoke re2c with --no-generation-date to prevent unintentional / unnecessary changes in generated files. 2012-12-06 09:43:27 +01:00
Sebastian Bergmann
eab14993fe Invoke re2c with --no-generation-date to prevent unintentional / unnecessary changes in generated files. 2012-12-06 09:28:35 +01:00
Johannes Schlüter
cd6bf838d5 Merge branch 'PHP-5.4' into PHP-5.5 2012-12-05 19:03:04 +01:00
Johannes Schlüter
811cd765a9 Merge branch 'PHP-5.3' into PHP-5.4 
Conflicts:
	configure.in
	main/php_version.h
 2012-12-05 19:02:41 +01:00
Johannes Schlüter
22fe268ad4 this will become PHP 5.3.21 2012-12-05 18:55:05 +01:00
Dmitry Stogov
bc7857169a Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Use get_gc instead of hacks of get_properties
 2012-12-05 17:59:46 +04:00
Dmitry Stogov
df97c3aa0d Use get_gc instead of hacks of get_properties 2012-12-05 17:58:36 +04:00
Dmitry Stogov
274ceb3d8d Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #63680 (Memleak in splfixedarray with cycle reference)

Conflicts:
	NEWS
 2012-12-05 17:55:21 +04:00
Dmitry Stogov
881416cda6 Fixed bug #63680 (Memleak in splfixedarray with cycle reference) 2012-12-05 17:53:26 +04:00
Dmitry Stogov
27528b601f Fixed comments 2012-12-05 16:02:47 +04:00
Dmitry Stogov
26c165cc03 Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 
* 'PHP-5.5' of git.php.net:php-src:
  Two tests deactivated until #63688 was fixed
 2012-12-05 13:37:40 +04:00
Dmitry Stogov
fa30e4754b Slight performance improvement 2012-12-05 13:23:37 +04:00
Anatoliy Belsky
7d7ff76659 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Two tests deactivated until #63688 was fixed
 2012-12-05 09:58:04 +01:00
Anatoliy Belsky
73e66ff1bd Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Two tests deactivated until #63688 was fixed
 2012-12-05 09:57:36 +01:00