granicus.if.org Git

Fixed bug #64235 (Insteadof not work for class method in 5.4.11)

As we discussed with stefan, we think previous of allowing use with
classes is a bug, should be forbided, anyway, the error message should
be improved.

commit | commitdiff | tree

Anatol Belski [Thu, 21 Feb 2013 10:00:54 +0000 (11:00 +0100)]

Merge branch 'PHP-5.5'

* PHP-5.5:
added back the older vc9 favours

commit | commitdiff | tree

Anatol Belski [Thu, 21 Feb 2013 09:59:50 +0000 (10:59 +0100)]

added back the older vc9 favours

commit | commitdiff | tree

Anatol Belski [Thu, 21 Feb 2013 09:34:40 +0000 (10:34 +0100)]

Merge branch 'PHP-5.5'

* PHP-5.5:
  updated lib versions
  updated lib versions
  updated lib versions

commit | commitdiff | tree

Anatol Belski [Thu, 21 Feb 2013 09:32:56 +0000 (10:32 +0100)]

updated lib versions

commit | commitdiff | tree

Anatol Belski [Thu, 21 Feb 2013 09:29:55 +0000 (10:29 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
updated lib versions
updated lib versions

commit | commitdiff | tree

Anatol Belski [Thu, 21 Feb 2013 09:27:37 +0000 (10:27 +0100)]

updated lib versions

commit | commitdiff | tree

Anatol Belski [Thu, 21 Feb 2013 09:26:38 +0000 (10:26 +0100)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
updated lib versions

commit | commitdiff | tree

Stanislav Malyshev [Thu, 21 Feb 2013 08:57:52 +0000 (00:57 -0800)]

Merge branch 'PHP-5.5'

* PHP-5.5:
  news for bug #49348
  fix tests
  fix bug #49348 - issue notice on get_property_ptr_ptr when used for read

commit | commitdiff | tree

Stanislav Malyshev [Thu, 21 Feb 2013 08:56:00 +0000 (00:56 -0800)]

news for bug #49348

commit | commitdiff | tree

Stanislav Malyshev [Thu, 21 Feb 2013 08:52:46 +0000 (00:52 -0800)]

Merge branch 'bug49348' into PHP-5.5

* bug49348:
fix tests
fix bug #49348 - issue notice on get_property_ptr_ptr when used for read

commit | commitdiff | tree

Anatol Belski [Thu, 21 Feb 2013 08:46:50 +0000 (09:46 +0100)]

updated lib versions

commit | commitdiff | tree

Dmitry Stogov [Wed, 20 Feb 2013 18:31:52 +0000 (22:31 +0400)]

Merge branch 'PHP-5.5'

* PHP-5.5:
Fixed external entity loading

commit | commitdiff | tree

Dmitry Stogov [Wed, 20 Feb 2013 18:30:59 +0000 (22:30 +0400)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fixed external entity loading

commit | commitdiff | tree

Dmitry Stogov [Wed, 20 Feb 2013 18:27:41 +0000 (22:27 +0400)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
Fixed external entity loading

Conflicts:
ext/libxml/libxml.c
ext/libxml/php_libxml.h

commit | commitdiff | tree

Dmitry Stogov [Wed, 20 Feb 2013 18:14:59 +0000 (22:14 +0400)]

Fixed external entity loading

commit | commitdiff | tree

Johannes Schlüter [Wed, 20 Feb 2013 10:58:29 +0000 (11:58 +0100)]

Merge branch 'PHP-5.5'

commit | commitdiff | tree

Johannes Schlüter [Wed, 20 Feb 2013 10:58:01 +0000 (11:58 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

commit | commitdiff | tree

Johannes Schlüter [Wed, 20 Feb 2013 10:57:11 +0000 (11:57 +0100)]

Merge branch 'PHP-5.3' into PHP-5.4

commit | commitdiff | tree

Johannes Schlüter [Wed, 20 Feb 2013 10:56:29 +0000 (11:56 +0100)]

5.3.22 NEWS

commit | commitdiff | tree

David Soria Parra [Tue, 19 Feb 2013 18:43:18 +0000 (19:43 +0100)]

Merge branch 'PHP-5.5'

* PHP-5.5:
Start new NEWS section for beta1
News for PHP 5.5.0 Alpha 5

commit | commitdiff | tree

David Soria Parra [Tue, 19 Feb 2013 18:42:27 +0000 (19:42 +0100)]

Start new NEWS section for beta1

commit | commitdiff | tree

David Soria Parra [Tue, 19 Feb 2013 18:26:33 +0000 (19:26 +0100)]

News for PHP 5.5.0 Alpha 5

commit | commitdiff | tree

David Soria Parra [Tue, 19 Feb 2013 18:41:02 +0000 (19:41 +0100)]

Merge branch 'PHP-5.5'

* PHP-5.5:
News for PHP 5.5.0 Alpha 5

commit | commitdiff | tree

David Soria Parra [Tue, 19 Feb 2013 18:26:33 +0000 (19:26 +0100)]

News for PHP 5.5.0 Alpha 5

commit | commitdiff | tree

Anatol Belski [Tue, 19 Feb 2013 08:05:45 +0000 (09:05 +0100)]

Merge branch 'PHP-5.5'

* PHP-5.5:
fix the test for curl 7.29.0+

commit | commitdiff | tree

Anatol Belski [Tue, 19 Feb 2013 08:05:27 +0000 (09:05 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
fix the test for curl 7.29.0+

commit | commitdiff | tree

Anatol Belski [Tue, 19 Feb 2013 08:04:52 +0000 (09:04 +0100)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
fix the test for curl 7.29.0+

commit | commitdiff | tree

Anatol Belski [Tue, 19 Feb 2013 08:04:06 +0000 (09:04 +0100)]

fix the test for curl 7.29.0+

commit | commitdiff | tree

Stanislav Malyshev [Tue, 19 Feb 2013 07:01:42 +0000 (23:01 -0800)]

fix tests

commit | commitdiff | tree

Stanislav Malyshev [Tue, 19 Feb 2013 04:56:02 +0000 (20:56 -0800)]

fix bug #49348 - issue notice on get_property_ptr_ptr when used for read

commit | commitdiff | tree

Dmitry Stogov [Mon, 18 Feb 2013 12:36:25 +0000 (16:36 +0400)]

Merge branch 'PHP-5.5'

* PHP-5.5:
Fixed bug #64070 (Inheritance with Traits failed with error)

commit | commitdiff | tree

Dmitry Stogov [Mon, 18 Feb 2013 12:20:49 +0000 (16:20 +0400)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fixed bug #64070 (Inheritance with Traits failed with error)

Conflicts:
NEWS
Zend/zend_compile.c

commit | commitdiff | tree

Dmitry Stogov [Mon, 18 Feb 2013 12:07:51 +0000 (16:07 +0400)]

Fixed bug #64070 (Inheritance with Traits failed with error)

commit | commitdiff | tree

Gustavo Lopes [Sun, 17 Feb 2013 21:43:28 +0000 (22:43 +0100)]

Merge branch 'PHP-5.5'

* PHP-5.5:
Cleanup some multicast code; fix for mac os x?

commit | commitdiff | tree

Gustavo Lopes [Sun, 17 Feb 2013 12:23:07 +0000 (13:23 +0100)]

Cleanup some multicast code; fix for mac os x?

When I moved some stuff from sockets.c to multicast.c, I did not copy
some conditional defines for systems without the RFC 3678 API.

I moved such defines to multicast.h so both sockets.c and multicast.c
can benefit from them and I prefixed them with PHP_ so that it's less
confusing: now PHP_MCAST_* are defined to either the MCAST_* RFC 3678
APIs or to legacy APIs and MCAST_* always mean the (possibly undefined)
system definitions.

commit | commitdiff | tree

Stanislav Malyshev [Sun, 17 Feb 2013 21:34:07 +0000 (13:34 -0800)]

Merge branch 'PHP-5.5'

* PHP-5.5:
fix protos

commit | commitdiff | tree

Stanislav Malyshev [Sun, 17 Feb 2013 21:33:48 +0000 (13:33 -0800)]

fix protos

commit | commitdiff | tree

Stanislav Malyshev [Sun, 17 Feb 2013 21:30:04 +0000 (13:30 -0800)]

Merge branch 'PHP-5.5'

* PHP-5.5:
fix bug #61930: openssl corrupts ssl key resource when using openssl_get_publickey()

commit | commitdiff | tree

Stanislav Malyshev [Sun, 17 Feb 2013 21:29:34 +0000 (13:29 -0800)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
fix bug #61930: openssl corrupts ssl key resource when using openssl_get_publickey()

commit | commitdiff | tree

Stanislav Malyshev [Sun, 17 Feb 2013 21:28:42 +0000 (13:28 -0800)]

fix bug #61930: openssl corrupts ssl key resource when using openssl_get_publickey()

commit | commitdiff | tree

Anatol Belski [Sun, 17 Feb 2013 19:29:58 +0000 (20:29 +0100)]

Merge branch 'PHP-5.5'

* PHP-5.5:
fix free vs. curl_free

commit | commitdiff | tree

Anatol Belski [Sun, 17 Feb 2013 19:29:20 +0000 (20:29 +0100)]

fix free vs. curl_free

commit | commitdiff | tree

Stanislav Malyshev [Sun, 17 Feb 2013 10:38:41 +0000 (02:38 -0800)]

Merge branch 'PHP-5.5'

* PHP-5.5:
update NEWS

commit | commitdiff | tree

Stanislav Malyshev [Sun, 17 Feb 2013 10:38:25 +0000 (02:38 -0800)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
update NEWS

commit | commitdiff | tree

Stanislav Malyshev [Sun, 17 Feb 2013 10:37:58 +0000 (02:37 -0800)]

update NEWS

commit | commitdiff | tree

Stanislav Malyshev [Sun, 17 Feb 2013 09:20:36 +0000 (01:20 -0800)]

Merge branch 'PHP-5.5'

* PHP-5.5:
Added HTTP codes as of RFC 6585

commit | commitdiff | tree

Stanislav Malyshev [Sun, 17 Feb 2013 09:19:08 +0000 (01:19 -0800)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Added HTTP codes as of RFC 6585

commit | commitdiff | tree

Jonh Wendell [Fri, 8 Feb 2013 16:09:11 +0000 (14:09 -0200)]

Added HTTP codes as of RFC 6585

Added descriptions for the new HTTP codes:

- 428 Precondition Required
- 429 Too Many Requests
- 431 Request Header Fields Too Large
- 511 Network Authentication Required

commit | commitdiff | tree

Xinchen Hui [Sun, 17 Feb 2013 03:07:07 +0000 (11:07 +0800)]

Merge branch 'PHP-5.5'

commit | commitdiff | tree

Xinchen Hui [Sun, 17 Feb 2013 03:06:33 +0000 (11:06 +0800)]

Merge branch 'PHP-5.4' into PHP-5.5

commit | commitdiff | tree

Xinchen Hui [Sun, 17 Feb 2013 03:05:34 +0000 (11:05 +0800)]

Merge branch 'PHP-5.3' into PHP-5.4

commit | commitdiff | tree

Xinchen Hui [Sun, 17 Feb 2013 03:04:36 +0000 (11:04 +0800)]

Fixed bug #64228 (RecursiveDirectoryIterator always assumes SKIP_DOTS)

commit | commitdiff | tree

Xinchen Hui [Sat, 16 Feb 2013 14:30:14 +0000 (22:30 +0800)]

Merge branch 'PHP-5.5'

commit | commitdiff | tree

Xinchen Hui [Sat, 16 Feb 2013 14:29:14 +0000 (22:29 +0800)]

Merge branch 'PHP-5.4' into PHP-5.5

commit | commitdiff | tree

Xinchen Hui [Sat, 16 Feb 2013 14:28:28 +0000 (22:28 +0800)]

Fix test failed after 0ea83ff8478d867ebf1603a43cd5d3432022cee7

commit | commitdiff | tree

Xinchen Hui [Sat, 16 Feb 2013 14:25:37 +0000 (22:25 +0800)]

Merge branch 'PHP-5.5'

commit | commitdiff | tree

Xinchen Hui [Sat, 16 Feb 2013 14:22:22 +0000 (22:22 +0800)]

Exceptions triggered by undefined variable should be handled before FATAL error

this is a enhancement of the fix for bug #64135

commit | commitdiff | tree

Boris Lytochkin [Thu, 14 Feb 2013 19:12:53 +0000 (23:12 +0400)]

Fixed bug #64124 (IPv6 malformed)

commit | commitdiff | tree

Boris Lytochkin [Thu, 14 Feb 2013 19:08:08 +0000 (23:08 +0400)]

+Fixed bug #64124 (IPv6 malformed). (Boris Lytochkin)

commit | commitdiff | tree

Dmitry Stogov [Wed, 13 Feb 2013 18:08:13 +0000 (22:08 +0400)]

Merge branch 'PHP-5.5'

* PHP-5.5:
Proper bit reset code

commit | commitdiff | tree

Dmitry Stogov [Wed, 13 Feb 2013 18:07:57 +0000 (22:07 +0400)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Proper bit reset code

commit | commitdiff | tree

Dmitry Stogov [Wed, 13 Feb 2013 18:07:21 +0000 (22:07 +0400)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
Proper bit reset code

commit | commitdiff | tree

Dmitry Stogov [Wed, 13 Feb 2013 18:06:37 +0000 (22:06 +0400)]

Proper bit reset code

commit | commitdiff | tree

Ard Biesheuvel [Wed, 13 Feb 2013 12:52:30 +0000 (13:52 +0100)]

Merge branch 'PHP-5.5'

commit | commitdiff | tree

Ard Biesheuvel [Wed, 13 Feb 2013 12:50:53 +0000 (13:50 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

commit | commitdiff | tree

Ard Biesheuvel [Wed, 13 Feb 2013 11:22:50 +0000 (12:22 +0100)]

Fixed bug #64197 (_Offsetof() macro used but not defined on ARM/Clang)

Updated the code to test for __ARMCC_VERSION instead of __arm, as
that is a more reliable indicator of whether the ARMCC compiler is
being used.

commit | commitdiff | tree

Ard Biesheuvel [Mon, 11 Feb 2013 16:54:54 +0000 (17:54 +0100)]

Merge branch 'PHP-5.5'

commit | commitdiff | tree

Ard Biesheuvel [Fri, 18 Jan 2013 09:13:10 +0000 (10:13 +0100)]

Update config.sub/config.guess to latest GPLv2 upstream version

This adds the ability to configure/build for/on 64-bit ARMv8,
which uses the host triplet 'aarch64-linux-gnu'.

Source:
http://git.savannah.gnu.org/gitweb/?p=config.git;h=306afce

commit | commitdiff | tree

Ard Biesheuvel [Mon, 11 Feb 2013 15:01:03 +0000 (16:01 +0100)]

Merge branch 'PHP-5.5'

commit | commitdiff | tree

Ard Biesheuvel [Mon, 11 Feb 2013 14:54:59 +0000 (15:54 +0100)]

NEWS update

commit | commitdiff | tree

Ard Biesheuvel [Mon, 11 Feb 2013 13:43:14 +0000 (14:43 +0100)]

Merge branch 'PHP-5.5'

commit | commitdiff | tree

Ard Biesheuvel [Mon, 11 Feb 2013 13:36:58 +0000 (14:36 +0100)]

Low-level ARM optimizations

- added ARM versions of zend_mm_high_bit()/zend_mm_low_bit()
- improved safe_address()

commit | commitdiff | tree

Ard Biesheuvel [Mon, 11 Feb 2013 12:53:27 +0000 (13:53 +0100)]

Improve x86 inline assembler

- added cc annotation to inline asm that clobbers the condition
flags
- remove hardcoded constants (IS_LONG,IS_DOUBLE)
- remove hardcoded offsets (zval->value, zval->type)

commit | commitdiff | tree

Andrey Hristov [Mon, 11 Feb 2013 11:28:55 +0000 (12:28 +0100)]

Merge branch 'master' of ssh://git.php.net/php-src

commit | commitdiff | tree

Andrey Hristov [Mon, 11 Feb 2013 11:07:55 +0000 (12:07 +0100)]

Merge branch 'PHP-5.5'

Conflicts:
NEWS

commit | commitdiff | tree

Andrey Hristov [Mon, 11 Feb 2013 11:07:10 +0000 (12:07 +0100)]

build fixes

commit | commitdiff | tree

Remi Collet [Mon, 11 Feb 2013 08:14:06 +0000 (09:14 +0100)]

Merge branch 'PHP-5.5'

* PHP-5.5:
NEWS
Fixed bug #64142 (dval to lval different behavior on ppc64)

commit | commitdiff | tree

Remi Collet [Mon, 11 Feb 2013 08:13:52 +0000 (09:13 +0100)]

NEWS

commit | commitdiff | tree

Remi Collet [Mon, 11 Feb 2013 08:13:27 +0000 (09:13 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fixed bug #64142 (dval to lval different behavior on ppc64)

commit | commitdiff | tree

Remi Collet [Mon, 11 Feb 2013 08:10:51 +0000 (09:10 +0100)]

Fixed bug #64142 (dval to lval different behavior on ppc64)

See discussion on internals
http://marc.info/?t=136042277700003&r=1&w=2

commit | commitdiff | tree

Stanislav Malyshev [Sun, 10 Feb 2013 07:05:58 +0000 (23:05 -0800)]

Merge branch 'PHP-5.5'

* PHP-5.5:
  update NEWS
  mb_split() can now handle empty matches like preg_split() does.
  mb_split() can now handle empty matches like preg_split() does.

commit | commitdiff | tree

Stanislav Malyshev [Sun, 10 Feb 2013 07:05:35 +0000 (23:05 -0800)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
update NEWS
mb_split() can now handle empty matches like preg_split() does.

commit | commitdiff | tree

Stanislav Malyshev [Sun, 10 Feb 2013 07:02:26 +0000 (23:02 -0800)]

update NEWS

commit | commitdiff | tree

Moriyoshi Koizumi [Sun, 10 Feb 2013 06:04:23 +0000 (15:04 +0900)]

mb_split() can now handle empty matches like preg_split() does.

commit | commitdiff | tree

Moriyoshi Koizumi [Sun, 10 Feb 2013 06:04:23 +0000 (15:04 +0900)]

mb_split() can now handle empty matches like preg_split() does.

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom