Commit Graph

72604 Commits

Author SHA1 Message Date
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
Remi Collet
7552a7eb19 NEWS 2012-12-01 10:26:20 +01:00
Remi Collet
e9c1a45daa Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  NEWS
2012-12-01 10:25:49 +01:00
Remi Collet
31ab57e052 NEWS 2012-12-01 10:25:37 +01:00
Remi Collet
92a5e4def0 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fixed Bug #63435 Datetime::format('u') sometimes wrong by 1 microsecond
2012-12-01 10:24:02 +01:00
Remi Collet
c2554b4bb4 Fixed Bug #63435 Datetime::format('u') sometimes wrong by 1 microsecond
When storing '015700' microseconds in a Datetime object,
Datetime::format('u') returns '015699'

Already known per bug45554 reproducer (also fixed).
2012-12-01 10:20:39 +01:00
Felipe Pena
80004db65d Merge branch 'PHP-5.5'
* PHP-5.5:
  - Fixed ZTS build
2012-11-30 09:07:47 -02:00
Felipe Pena
5db372fbdc - Fixed ZTS build 2012-11-30 09:07:35 -02:00
Dmitry Stogov
8cbe4f7e17 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed bug #63066 (Calling an undefined method in a generator results in a seg fault) (fixed with previous commit).
2012-11-30 14:16:38 +04:00
Dmitry Stogov
66b8ece02a Fixed bug #63066 (Calling an undefined method in a generator results in a seg fault) (fixed with previous commit). 2012-11-30 14:14:36 +04:00
Dmitry Stogov
3985f06115 Merge branch 'PHP-5.5'
* PHP-5.5:
  . The VM stacks for passing function arguments and syntaticaly nested calls were merged into a single stack. The stack size needed for op_array execution is calculated at compile time and preallocated at once. As result all the stack push operatins don't require checks for stack overflow any more. . Generators implementation was improved using the new VM stack. Now it's a bit more clear and faster.
2012-11-30 14:03:23 +04:00
Dmitry Stogov
70f83f35d0 . The VM stacks for passing function arguments and syntaticaly nested calls were merged into a single stack. The stack size needed for op_array execution is calculated at compile time and preallocated at once. As result all the stack push operatins don't require checks for stack overflow any more.
. Generators implementation was improved using the new VM stack. Now it's a bit more clear and faster.
2012-11-30 13:39:23 +04:00
Xinchen Hui
db74b9c76e Merge branch 'PHP-5.5' 2012-11-30 14:50:35 +08:00
Xinchen Hui
9f7e53fde8 Merge branch 'PHP-5.4' into PHP-5.5 2012-11-30 14:50:01 +08:00
Xinchen Hui
35f636019d Merge branch 'PHP-5.3' into PHP-5.4 2012-11-30 14:49:35 +08:00
Xinchen Hui
ff6c9e2726 Fixed bug #63377 (Segfault on output buffer) 2012-11-30 14:48:51 +08:00
Xinchen Hui
79331f7533 Merge branch 'PHP-5.5' 2012-11-30 14:34:10 +08:00
Xinchen Hui
055b6c9ce0 Merge branch 'PHP-5.4' into PHP-5.5 2012-11-30 14:33:52 +08:00
Xinchen Hui
96300f551a format 2012-11-30 14:33:29 +08:00
Xinchen Hui
dc36933181 Merge branch 'PHP-5.3' into PHP-5.4 2012-11-30 14:33:24 +08:00
Xinchen Hui
00d86afedf Format 2012-11-30 14:32:15 +08:00
Xinchen Hui
d173909e88 Merge branch 'PHP-5.5' 2012-11-30 14:31:19 +08:00
Xinchen Hui
093d119597 Merge branch 'PHP-5.4' into PHP-5.5 2012-11-30 14:30:37 +08:00
Xinchen Hui
b689819567 Merge branch 'PHP-5.3' into PHP-5.4 2012-11-30 14:29:59 +08:00
Xinchen Hui
40fabf68ed Fixed bug #63398 (Segfault when polling closed link) 2012-11-30 14:28:32 +08:00
Dmitry Stogov
2d458b2348 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed bug #63271 (SOAP wsdl cache is not enabled after initial requests)
2012-11-29 16:45:22 +04:00
Dmitry Stogov
9e1d3cfdab Fixed bug #63271 (SOAP wsdl cache is not enabled after initial requests) 2012-11-29 16:44:19 +04:00
Dmitry Stogov
7f7cff0bbb Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fixed bug #63271 (SOAP wsdl cache is not enabled after initial requests)

Conflicts:
	NEWS
	ext/soap/soap.c
2012-11-29 16:41:09 +04:00
Dmitry Stogov
dc2192c087 Fixed bug #63271 (SOAP wsdl cache is not enabled after initial requests) 2012-11-29 16:31:08 +04:00
Dmitry Stogov
2cfe91f684 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed bug #61557 (Crasher in tt-rss backend.php)
2012-11-29 14:43:46 +04:00
Dmitry Stogov
bf6fea6ba0 Fixed bug #61557 (Crasher in tt-rss backend.php) 2012-11-29 14:41:20 +04:00
Dmitry Stogov
1a09bf8023 Fixed bug #61557 (Crasher in tt-rss backend.php) 2012-11-29 14:38:18 +04:00
Dmitry Stogov
8b7df4bbd8 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed bug #63635 (Segfault in gc_collect_cycles)
2012-11-29 13:48:44 +04:00
Dmitry Stogov
3c1888f584 Fixed bug #63635 (Segfault in gc_collect_cycles) 2012-11-29 13:06:12 +04:00
Dmitry Stogov
f877d7fee6 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fixed bug #63635 (Segfault in gc_collect_cycles)

Conflicts:
	NEWS
2012-11-29 12:38:34 +04:00
Dmitry Stogov
92e2f29381 Fixed bug #63635 (Segfault in gc_collect_cycles) 2012-11-29 12:25:20 +04:00