granicus.if.org Git - php/log

]> granicus.if.org Git - php/log

projects / php / log

summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next

commit | commitdiff | tree

Pierre Joye [Mon, 4 Mar 2013 11:03:01 +0000 (12:03 +0100)]

Merge branch 'PHP-5.5'

* PHP-5.5:
  - add test for imagecropauto
  - (s)rgb distance works way better for now, re enable threshold
  - disable threshold for now, will enable it again using CIEDE2000
  - add todo for threshold
  - clean and enable threshold
  - add image crop support

Conflicts:
UPGRADING

commit | commitdiff | tree

Pierre Joye [Mon, 4 Mar 2013 06:26:07 +0000 (07:26 +0100)]

- add test for imagecropauto

commit | commitdiff | tree

Pierre Joye [Sun, 3 Mar 2013 04:30:12 +0000 (05:30 +0100)]

- (s)rgb distance works way better for now, re enable threshold

commit | commitdiff | tree

Pierre Joye [Fri, 1 Mar 2013 07:10:49 +0000 (08:10 +0100)]

- disable threshold for now, will enable it again using CIEDE2000

commit | commitdiff | tree

Pierre Joye [Thu, 28 Feb 2013 18:34:14 +0000 (19:34 +0100)]

- add todo for threshold

commit | commitdiff | tree

Pierre Joye [Thu, 28 Feb 2013 18:22:06 +0000 (19:22 +0100)]

- clean and enable threshold

commit | commitdiff | tree

Pierre Joye [Thu, 28 Feb 2013 16:24:23 +0000 (17:24 +0100)]

- add image crop support

commit | commitdiff | tree

Pierre Joye [Wed, 27 Feb 2013 20:03:09 +0000 (21:03 +0100)]

Merge branch 'PHP-5.5'

* PHP-5.5:
- typo

commit | commitdiff | tree

Pierre Joye [Wed, 27 Feb 2013 20:02:47 +0000 (21:02 +0100)]

- typo

commit | commitdiff | tree

Pierre Joye [Wed, 27 Feb 2013 19:23:38 +0000 (20:23 +0100)]

Merge branch 'PHP-5.5'

* PHP-5.5:
  - fix name for imageflip constants, consistent witht the other
  - add test
  - add constants for imageflip

commit | commitdiff | tree

Pierre Joye [Wed, 27 Feb 2013 19:23:31 +0000 (20:23 +0100)]

- fix name for imageflip constants, consistent witht the other

commit | commitdiff | tree

Pierre Joye [Wed, 27 Feb 2013 19:22:45 +0000 (20:22 +0100)]

- add test

commit | commitdiff | tree

Pierre Joye [Wed, 27 Feb 2013 19:08:26 +0000 (20:08 +0100)]

- add constants for imageflip

commit | commitdiff | tree

Pierre Joye [Wed, 27 Feb 2013 15:03:27 +0000 (16:03 +0100)]

Merge branch 'PHP-5.5'

* PHP-5.5:
- add only once
- add new file for m4 as well

commit | commitdiff | tree

Pierre Joye [Wed, 27 Feb 2013 15:03:17 +0000 (16:03 +0100)]

- add only once

commit | commitdiff | tree

Pierre Joye [Wed, 27 Feb 2013 15:02:54 +0000 (16:02 +0100)]

- add new file for m4 as well

commit | commitdiff | tree

Pierre Joye [Wed, 27 Feb 2013 15:00:11 +0000 (16:00 +0100)]

- fix conflict on merge

commit | commitdiff | tree

Pierre Joye [Wed, 27 Feb 2013 09:39:25 +0000 (10:39 +0100)]

- add image flip API support

commit | commitdiff | tree

Pierre Joye [Wed, 27 Feb 2013 09:39:16 +0000 (10:39 +0100)]

- add image flip API support

commit | commitdiff | tree

Pierre Joye [Wed, 27 Feb 2013 09:39:09 +0000 (10:39 +0100)]

- add image flip API support

commit | commitdiff | tree

Pierre Joye [Wed, 27 Feb 2013 09:38:55 +0000 (10:38 +0100)]

- add image flip API support

commit | commitdiff | tree

Pierre Joye [Wed, 27 Feb 2013 09:38:33 +0000 (10:38 +0100)]

- add image flip API support

commit | commitdiff | tree

Pierre Joye [Wed, 27 Feb 2013 09:37:48 +0000 (10:37 +0100)]

- add image flip API support

commit | commitdiff | tree

Stanislav Malyshev [Wed, 27 Feb 2013 06:26:55 +0000 (22:26 -0800)]

Merge branch 'PHP-5.5'

* PHP-5.5:
5.4.13 branched, now it's 5.4.14

commit | commitdiff | tree

Stanislav Malyshev [Wed, 27 Feb 2013 06:26:36 +0000 (22:26 -0800)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
5.4.13 branched, now it's 5.4.14

Conflicts:
configure.in
main/php_version.h

commit | commitdiff | tree

Stanislav Malyshev [Wed, 27 Feb 2013 06:25:33 +0000 (22:25 -0800)]

5.4.13 branched, now it's 5.4.14

commit | commitdiff | tree

Stanislav Malyshev [Wed, 27 Feb 2013 06:20:56 +0000 (22:20 -0800)]

Merge branch 'PHP-5.5'

* PHP-5.5:
add news for SOAP fixes

commit | commitdiff | tree

Stanislav Malyshev [Wed, 27 Feb 2013 06:20:50 +0000 (22:20 -0800)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
add news for SOAP fixes

commit | commitdiff | tree

Stanislav Malyshev [Wed, 27 Feb 2013 06:20:21 +0000 (22:20 -0800)]

add news for SOAP fixes

commit | commitdiff | tree

Stanislav Malyshev [Wed, 27 Feb 2013 06:13:31 +0000 (22:13 -0800)]

Merge branch 'PHP-5.5'

* PHP-5.5:
Bug #52861: unset fails with ArrayObject and deep arrays

commit | commitdiff | tree

Stanislav Malyshev [Wed, 27 Feb 2013 06:13:01 +0000 (22:13 -0800)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Bug #52861: unset fails with ArrayObject and deep arrays

commit | commitdiff | tree

Stanislav Malyshev [Wed, 27 Feb 2013 06:12:15 +0000 (22:12 -0800)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
Bug #52861: unset fails with ArrayObject and deep arrays

commit | commitdiff | tree

Mike Willbanks [Fri, 22 Feb 2013 21:05:38 +0000 (13:05 -0800)]

Bug #52861: unset fails with ArrayObject and deep arrays

When checking to make into a reference write, readwrite are checked but not unset

commit | commitdiff | tree

Remi Collet [Tue, 26 Feb 2013 13:36:04 +0000 (14:36 +0100)]

Merge branch 'PHP-5.5'

* PHP-5.5:
add support for ppc64p7 arch (Power7 optimized)

commit | commitdiff | tree

Remi Collet [Tue, 26 Feb 2013 13:35:47 +0000 (14:35 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
add support for ppc64p7 arch (Power7 optimized)

commit | commitdiff | tree

Remi Collet [Tue, 26 Feb 2013 13:35:34 +0000 (14:35 +0100)]

add support for ppc64p7 arch (Power7 optimized)

commit | commitdiff | tree

Xinchen Hui [Sun, 24 Feb 2013 05:00:01 +0000 (13:00 +0800)]

Merge branch 'PHP-5.5'

commit | commitdiff | tree

Xinchen Hui [Sun, 24 Feb 2013 04:59:10 +0000 (12:59 +0800)]

Merge branch 'PHP-5.4' into PHP-5.5

commit | commitdiff | tree

Xinchen Hui [Sun, 24 Feb 2013 04:58:39 +0000 (12:58 +0800)]

Merge branch 'PHP-5.3' into PHP-5.4

Conflicts:
ext/spl/spl_fixedarray.c

commit | commitdiff | tree

Xinchen Hui [Sun, 24 Feb 2013 04:55:46 +0000 (12:55 +0800)]

Fixed bug #64264 (SPLFixedArray toArray problem)

commit | commitdiff | tree

Gustavo Lopes [Sun, 24 Feb 2013 02:51:11 +0000 (03:51 +0100)]

Merge branch 'PHP-5.5'

* PHP-5.5:
sendrecvmsg_shutdown function moved to mshutdown

commit | commitdiff | tree

Gustavo Lopes [Sun, 24 Feb 2013 02:40:22 +0000 (03:40 +0100)]

sendrecvmsg_shutdown function moved to mshutdown

The function php_socket_sendrecvmsg_shutdown() should have been called in
MSHUTDOWN, not RSHUTDOWN.

Bug only on TSRM builds.

Should fix bug #64287.

commit | commitdiff | tree

Gustavo Lopes [Sat, 23 Feb 2013 23:49:41 +0000 (00:49 +0100)]

Merge branch 'PHP-5.5'

* PHP-5.5:
Fix ext/sockets build with phpize
Fix ext/intl build with phpize

commit | commitdiff | tree

Gustavo Lopes [Sat, 23 Feb 2013 23:47:44 +0000 (00:47 +0100)]

Fix ext/sockets build with phpize

Fixes bug #64285

commit | commitdiff | tree

Gustavo Lopes [Sat, 23 Feb 2013 23:30:08 +0000 (00:30 +0100)]

Fix ext/intl build with phpize

Fixes bug #64284.

commit | commitdiff | tree

Gustavo Lopes [Sat, 23 Feb 2013 17:07:22 +0000 (18:07 +0100)]

Merge branch 'PHP-5.5'

* PHP-5.5:
  NEWS for 8718755
  Remove trailing whitespace; break long lines
  Fix rounding of zend_dval_to_lval
  Fix zend_dval_to_lval outside 64bit integers range

commit | commitdiff | tree

Gustavo Lopes [Sat, 23 Feb 2013 17:07:01 +0000 (18:07 +0100)]

NEWS for 8718755

commit | commitdiff | tree

Gustavo Lopes [Sat, 23 Feb 2013 17:00:21 +0000 (18:00 +0100)]

Remove trailing whitespace; break long lines

commit | commitdiff | tree

Gustavo Lopes [Sat, 23 Feb 2013 16:59:28 +0000 (17:59 +0100)]

Merge branch 'dval_to_lval' into PHP-5.5

* dval_to_lval:
Fix rounding of zend_dval_to_lval
Fix zend_dval_to_lval outside 64bit integers range

commit | commitdiff | tree

Gustavo Lopes [Fri, 22 Feb 2013 23:41:39 +0000 (00:41 +0100)]

Fix rounding of zend_dval_to_lval

Now rounding is always towards zero; the rounding can be though as if
occurring on the original double. Only relevant for the 32-bit long
variant.

commit | commitdiff | tree

Gustavo Lopes [Sun, 17 Feb 2013 22:40:26 +0000 (23:40 +0100)]

Fix zend_dval_to_lval outside 64bit integers range

PHP should preserve the least significant bits when casting from double
to long. Zend.m4 contains this:

AC_DEFINE([ZEND_DVAL_TO_LVAL_CAST_OK], 1, [Define if double cast to long preserves least significant bits])

If ZEND_DVAL_TO_LVAL_CAST_OK is not defined, zend_operators.h had an
inline implementation of zend_dval_to_lval() that would do a cast to an
int64_t (when sizeof(long) == 4), then a cast to unsigned long and
finally the cast to long.

While this works well for doubles inside the range of values of the type
used in the first cast (int64_t in the 32-bit version and unsigned long
in the 64-bit version), if outside the range, it is undefined behavior
that WILL give varying and not particularly useful results.

This commit uses fmod() to first put the double in a range that can
safely be cast to unsigned long and then casts this unsigned long to
long. This last cast is implementation defined, but it's very likely
that this gives the expected result (i.e. the internal 2's complement
representation is unchanged) on all platforms that PHP supports. In any
case, the previous implementationa already had this assumption.

This alternative code path is indeed significantly slower than simply
casting the double (almost an order of magnitude), but that should not
matter because casting doubles with a very high absolute value is a
rare event.

commit | commitdiff | tree

Andrey Hristov [Fri, 22 Feb 2013 12:50:13 +0000 (13:50 +0100)]

Merge branch 'PHP-5.5'

commit | commitdiff | tree

Andrey Hristov [Fri, 22 Feb 2013 12:50:04 +0000 (13:50 +0100)]

relax the check

commit | commitdiff | tree

Andrey Hristov [Fri, 22 Feb 2013 12:18:07 +0000 (13:18 +0100)]

Merge branch 'PHP-5.5'

commit | commitdiff | tree

Andrey Hristov [Fri, 22 Feb 2013 12:17:46 +0000 (13:17 +0100)]

Add some parameter checks

commit | commitdiff | tree

Johannes Schlüter [Thu, 21 Feb 2013 15:51:37 +0000 (16:51 +0100)]

Merge branch 'PHP-5.5'

commit | commitdiff | tree

Johannes Schlüter [Thu, 21 Feb 2013 15:50:59 +0000 (16:50 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

commit | commitdiff | tree

Johannes Schlüter [Thu, 21 Feb 2013 15:49:28 +0000 (16:49 +0100)]

Fix #60840 (undefined symbol: mysqlnd_debug_std_no_trace_funcs)

commit | commitdiff | tree

Johannes Schlüter [Thu, 21 Feb 2013 14:11:09 +0000 (15:11 +0100)]

Merge branch 'PHP-5.5'

commit | commitdiff | tree

Johannes Schlüter [Thu, 21 Feb 2013 14:10:47 +0000 (15:10 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

commit | commitdiff | tree

Johannes Schlüter [Thu, 21 Feb 2013 14:10:15 +0000 (15:10 +0100)]

Merge branch 'PHP-5.3' into PHP-5.4

commit | commitdiff | tree

Johannes Schlüter [Thu, 21 Feb 2013 14:08:58 +0000 (15:08 +0100)]

Fix TSRM (after afc1debb)

commit | commitdiff | tree

Dmitry Stogov [Thu, 21 Feb 2013 12:23:36 +0000 (16:23 +0400)]

Merge branch 'PHP-5.5'

* PHP-5.5:
PHAR should modify entry timestamp when it's modified

commit | commitdiff | tree

Dmitry Stogov [Thu, 21 Feb 2013 12:08:07 +0000 (16:08 +0400)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
PHAR should modify entry timestamp when it's modified

commit | commitdiff | tree

Dmitry Stogov [Thu, 21 Feb 2013 11:57:26 +0000 (15:57 +0400)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
PHAR should modify entry timestamp when it's modified

commit | commitdiff | tree

Dmitry Stogov [Thu, 21 Feb 2013 11:55:20 +0000 (15:55 +0400)]

PHAR should modify entry timestamp when it's modified

commit | commitdiff | tree

Sara Golemon [Thu, 21 Feb 2013 11:22:31 +0000 (03:22 -0800)]

Merge branch 'PHP-5.5'

* PHP-5.5:
http-stream test requires network connectivity

commit | commitdiff | tree

Sara Golemon [Thu, 21 Feb 2013 11:22:09 +0000 (03:22 -0800)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
http-stream test requires network connectivity

commit | commitdiff | tree

Sara Golemon [Thu, 21 Feb 2013 11:21:49 +0000 (03:21 -0800)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
http-stream test requires network connectivity

commit | commitdiff | tree

Sara Golemon [Thu, 21 Feb 2013 11:21:23 +0000 (03:21 -0800)]

http-stream test requires network connectivity

commit | commitdiff | tree

Xinchen Hui [Thu, 21 Feb 2013 10:21:19 +0000 (18:21 +0800)]

Merge branch 'PHP-5.5'

commit | commitdiff | tree

Xinchen Hui [Thu, 21 Feb 2013 10:20:48 +0000 (18:20 +0800)]

Merge branch 'PHP-5.4' into PHP-5.5

commit | commitdiff | tree

Xinchen Hui [Thu, 21 Feb 2013 10:18:41 +0000 (18:18 +0800)]

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+

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