Commit Graph

72390 Commits

Author SHA1 Message Date
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
Anatoliy Belsky
94cbd6374a Two tests deactivated until #63688 was fixed 2012-12-05 09:55:49 +01:00
Stanislav Malyshev
16b1d45e69 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  5.4.11-dev

Conflicts:
	configure.in
	main/php_version.h
2012-12-04 21:33:31 -08:00
Stanislav Malyshev
c3b6f6feed 5.4.11-dev 2012-12-04 21:30:50 -08:00
Stanislav Malyshev
266059d6f0 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  update NEWS
2012-12-04 21:28:02 -08:00
Stanislav Malyshev
d398456e48 update NEWS 2012-12-04 21:27:25 -08:00
Stanislav Malyshev
1c8f106d9a Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fix bug #63666 - Poor date() performance
2012-12-04 21:02:55 -08:00
Stanislav Malyshev
fd650ec93e fix bug #63666 - Poor date() performance 2012-12-04 21:02:09 -08:00
David Soria Parra
86bf83dcf2 News for enabling systemtap support on linux 2012-12-05 00:54:36 +01:00
David Soria Parra
288f8734f6 Pass zend_execute_data instead of zend_op_array 2012-12-05 00:45:23 +01:00
David Soria Parra
15a251a424 Overwrite execute_ex instead of execute in dtrace_execute 2012-12-04 21:01:32 +01:00
David Soria Parra
3de00bc615 Enable dtrace probes on linux as they are compatible with systemtap
You can build php with dtrace probes enabled on linux if you have
systemtap with uprobes.
2012-12-04 19:36:06 +01:00
Dmitry Stogov
9e39a636da Increased version numbers 2012-12-04 10:48:09 +04:00
Dmitry Stogov
61dbf35cfc Moved zend_create_execute_data_from_op_array() implementation from zend_vm_execute.skl to zend_execute.c 2012-12-04 10:42:19 +04:00
Dmitry Stogov
7651d64556 Optimized access to temporary and compiled VM variables 2012-12-04 10:14:39 +04:00
Remi Collet
784850211e Reduce case where this test will fails:
- no connection AND no mysqli extension

So, will succeed when no configured connection, but mysqli available.
2012-12-03 15:32:52 +01:00
Anatoliy Belsky
17dd769ab0 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Revert the previous test fix
2012-12-03 15:16:34 +01:00
Anatoliy Belsky
b8553d8494 Revert the previous test fix
The fail seems to be due to network error
2012-12-03 15:14:43 +01:00