clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-02 07:16:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
72,639 Commits 494 Branches 1,367 Tags 803 MiB
245dbb043e
Commit Graph

72639 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitry Stogov
77a9b9ac22 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Slight performance improvement
 2012-12-05 13:36:28 +04:00
Dmitry Stogov
fa30e4754b Slight performance improvement 2012-12-05 13:23:37 +04:00
Anatoliy Belsky
9e50c54eec Merge branch 'PHP-5.5' 
* PHP-5.5:
  Two tests deactivated until #63688 was fixed
 2012-12-05 09:58:25 +01: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
fdd339677b Merge branch 'PHP-5.5' 
* PHP-5.5:
  5.4.11-dev
 2012-12-04 21:33:44 -08: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
7883c07297 Merge branch 'PHP-5.5' 
* PHP-5.5:
  update NEWS
 2012-12-04 21:28:12 -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
8277f0f3f0 Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix bug #63666 - Poor date() performance
 2012-12-04 21:03:14 -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
981bc6fd96 Merge branch 'PHP-5.5' 
* PHP-5.5:
  News for enabling systemtap support on linux
 2012-12-05 00:54:45 +01:00
David Soria Parra
86bf83dcf2 News for enabling systemtap support on linux 2012-12-05 00:54:36 +01:00
David Soria Parra
808afd6db3 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Pass zend_execute_data instead of zend_op_array
 2012-12-05 00:46:30 +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
e4c1aa33ab Merge branch 'PHP-5.5' 
* PHP-5.5:
  Overwrite execute_ex instead of execute in dtrace_execute
  Enable dtrace probes on linux as they are compatible with systemtap
 2012-12-04 21:02: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
4d5859558a Merge branch 'PHP-5.5' 
* PHP-5.5:
  Increased version numbers
 2012-12-04 10:48:49 +04:00
Dmitry Stogov
9e39a636da Increased version numbers 2012-12-04 10:48:09 +04:00
Dmitry Stogov
f4263c2d0f Merge branch 'PHP-5.5' 
* PHP-5.5:
  Moved zend_create_execute_data_from_op_array() implementation from zend_vm_execute.skl to zend_execute.c
 2012-12-04 10:43:59 +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
3f47131fc6 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Optimized access to temporary and compiled VM variables
 2012-12-04 10:35:52 +04:00
Dmitry Stogov
7651d64556 Optimized access to temporary and compiled VM variables 2012-12-04 10:14:39 +04:00
Remi Collet
65973c240e Merge branch 'PHP-5.5' 
* PHP-5.5:
  Reduce case where this test will fails: - no connection AND no mysqli extension
 2012-12-03 15:35:15 +01: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
5619122fd2 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Revert the previous test fix
 2012-12-03 15:16:54 +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
Remi Collet
f78a68ff95 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fix inifile.c:419:6: warning: variable 'ret' set but not used [-Wunused-but-set-variable] Please check this minor change.
  use php_stream_copy_to_stream_ex instead of deprecated php_stream_copy_to_stream
 2012-12-03 13:39:58 +01: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
Anatoliy Belsky
243da297c3 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fix test with a slightly different warning in TS
  Adding tests for private and protected properties
  Fixing test according to @jpauli's suggestions
  Adding regression test for behavior of magic methods with unset public properties

Conflicts:
	NEWS
 2012-12-03 10:53:14 +01:00
Anatoliy Belsky
262decd35f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix test with a slightly different warning in TS
 2012-12-03 10:44:10 +01:00
Anatoliy Belsky
89e547ce7f Fix test with a slightly different warning in TS 2012-12-03 10:41:17 +01:00
Lars Strojny
87b8ee755a Merge branch 'PHP-5.5' 2012-12-02 19:52:16 +01:00
Lars Strojny
5dd3ba5da9 Merge branch 'PHP-5.4' into PHP-5.5 2012-12-02 19:51:51 +01:00
Marco Pivetta
627eb9e3d9 Adding tests for private and protected properties 2012-12-02 19:47:18 +01:00
Marco Pivetta
12f451c771 Fixing test according to @jpauli's suggestions 2012-12-02 19:47:13 +01:00
Marco Pivetta
1377942b69 Adding regression test for behavior of magic methods with unset public properties 
Verifies that after having unset a public property, any access to it, be it read or write, causes calls to public magic methods

Signed-off-by: Marco Pivetta <ocramius@gmail.com>
 2012-12-02 19:47:09 +01:00
Lars Strojny
575b983703 Merge branch 'PHP-5.4' into PHP-5.5 2012-12-02 19:42:25 +01:00
Lars Strojny
d1b8c6df76 Merge branch 'PHP-5.4' 2012-12-02 19:41:55 +01:00
Lars Strojny
12de2e91d0 News entry for bug #49341 2012-12-02 19:41:19 +01:00
Igor Wiedler
ec2a132f9c Bug #49341: Add SO_REUSEPORT support for socket_set_option() 
This is a BSD-only feature, and it will only be available on BSD.
On other platforms the constant will simply not be set.
 2012-12-02 18:56:57 +01:00
Remi Collet
d77dab19eb Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed Bug #63435 Datetime::format('u') sometimes wrong by 1 microsecond
 2012-12-01 10:26:55 +01:00
Remi Collet
50fec2bae2 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed Bug #63435 Datetime::format('u') sometimes wrong by 1 microsecond
 2012-12-01 10:26:32 +01:00