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

Freek [Tue, 28 Jan 2014 10:47:14 +0000 (11:47 +0100)]

Fix #66562: Consistency bug where curl_multi_getcontent behaves different from curl_exec

curl_exec returns an empty string when data is received from a domain that returns zero content. curl_multi_getcontent
returned null. Now it returns an empty string fixing the incosistency

commit | commitdiff | tree

Daniel Lowrey [Mon, 27 Jan 2014 22:00:04 +0000 (15:00 -0700)]

Merge branch '5.6'

* 5.6:
Update NEWS/UPGRADING
Prevent invalid SAN peer verification on null byte prefix attack

commit | commitdiff | tree

Daniel Lowrey [Mon, 27 Jan 2014 21:58:04 +0000 (14:58 -0700)]

Update NEWS/UPGRADING

commit | commitdiff | tree

Daniel Lowrey [Mon, 27 Jan 2014 21:51:22 +0000 (14:51 -0700)]

Prevent invalid SAN peer verification on null byte prefix attack

commit | commitdiff | tree

Yasuo Ohgaki [Mon, 27 Jan 2014 09:58:06 +0000 (18:58 +0900)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Remove obsolete description

commit | commitdiff | tree

Yasuo Ohgaki [Mon, 27 Jan 2014 09:57:45 +0000 (18:57 +0900)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Remove obsolete description

Conflicts:
php.ini-development
php.ini-production

commit | commitdiff | tree

Yasuo Ohgaki [Mon, 27 Jan 2014 09:55:50 +0000 (18:55 +0900)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Remove obsolete description

commit | commitdiff | tree

Yasuo Ohgaki [Mon, 27 Jan 2014 09:41:31 +0000 (18:41 +0900)]

Remove obsolete description

commit | commitdiff | tree

Stanislav Malyshev [Mon, 27 Jan 2014 01:21:33 +0000 (17:21 -0800)]

Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix English and improve by Stas. Thanks :)
  Update source docs
  Revert "Update source docs"
  Update source docs

commit | commitdiff | tree

Stanislav Malyshev [Mon, 27 Jan 2014 01:21:14 +0000 (17:21 -0800)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix English and improve by Stas. Thanks :)
  Update source docs
  Revert "Update source docs"
  Update source docs

Conflicts:
README.EXTENSIONS

commit | commitdiff | tree

Stanislav Malyshev [Mon, 27 Jan 2014 01:20:21 +0000 (17:20 -0800)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix English and improve by Stas. Thanks :)
  Update source docs
  Revert "Update source docs"
  Update source docs

commit | commitdiff | tree

Yasuo Ohgaki [Sun, 26 Jan 2014 21:50:11 +0000 (06:50 +0900)]

Fix English and improve by Stas. Thanks :)

commit | commitdiff | tree

Yasuo Ohgaki [Sun, 26 Jan 2014 09:31:27 +0000 (18:31 +0900)]

Update source docs

commit | commitdiff | tree

Yasuo Ohgaki [Sun, 26 Jan 2014 09:30:25 +0000 (18:30 +0900)]

Revert "Update source docs"

This reverts commit 10d06cd4ff3038d2f02a18936793969e7aee0bda.

commit | commitdiff | tree

Yasuo Ohgaki [Sun, 26 Jan 2014 09:28:21 +0000 (18:28 +0900)]

Update source docs

commit | commitdiff | tree

Stanislav Malyshev [Sun, 26 Jan 2014 23:51:46 +0000 (15:51 -0800)]

Merge branch 'PHP-5.6'

* PHP-5.6:
drop precision since trigonometric functions are non-portable
XFAIL multibyte tests until they are fixed (bug 66582)

commit | commitdiff | tree

Stanislav Malyshev [Sun, 26 Jan 2014 23:51:38 +0000 (15:51 -0800)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
drop precision since trigonometric functions are non-portable
XFAIL multibyte tests until they are fixed (bug 66582)

commit | commitdiff | tree

Stanislav Malyshev [Sun, 26 Jan 2014 23:51:27 +0000 (15:51 -0800)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
drop precision since trigonometric functions are non-portable
XFAIL multibyte tests until they are fixed (bug 66582)

commit | commitdiff | tree

Stanislav Malyshev [Sun, 26 Jan 2014 23:14:16 +0000 (15:14 -0800)]

drop precision since trigonometric functions are non-portable

See: http://stackoverflow.com/questions/21212326/floating-point-arithmetic-and-reproducibility

commit | commitdiff | tree

Stanislav Malyshev [Sun, 26 Jan 2014 23:11:15 +0000 (15:11 -0800)]

XFAIL multibyte tests until they are fixed (bug 66582)

commit | commitdiff | tree

Stanislav Malyshev [Sun, 26 Jan 2014 23:16:08 +0000 (15:16 -0800)]

Merge branch 'PHP-5.6'

* PHP-5.6:
drop precision since trigonometric functions are non-portable

commit | commitdiff | tree

Stanislav Malyshev [Sun, 26 Jan 2014 23:15:50 +0000 (15:15 -0800)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
drop precision since trigonometric functions are non-portable

commit | commitdiff | tree

Stanislav Malyshev [Sun, 26 Jan 2014 23:15:38 +0000 (15:15 -0800)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
drop precision since trigonometric functions are non-portable

commit | commitdiff | tree

Stanislav Malyshev [Sun, 26 Jan 2014 23:14:16 +0000 (15:14 -0800)]

drop precision since trigonometric functions are non-portable

See: http://stackoverflow.com/questions/21212326/floating-point-arithmetic-and-reproducibility

commit | commitdiff | tree

Stanislav Malyshev [Sun, 26 Jan 2014 23:12:40 +0000 (15:12 -0800)]

Merge branch 'PHP-5.6'

* PHP-5.6:
XFAIL multibyte tests until they are fixed (bug 66582)

commit | commitdiff | tree

Stanislav Malyshev [Sun, 26 Jan 2014 23:12:19 +0000 (15:12 -0800)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
XFAIL multibyte tests until they are fixed (bug 66582)

commit | commitdiff | tree

Stanislav Malyshev [Sun, 26 Jan 2014 23:12:00 +0000 (15:12 -0800)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
XFAIL multibyte tests until they are fixed (bug 66582)

commit | commitdiff | tree

Stanislav Malyshev [Sun, 26 Jan 2014 23:11:15 +0000 (15:11 -0800)]

XFAIL multibyte tests until they are fixed (bug 66582)

commit | commitdiff | tree

Stanislav Malyshev [Sun, 26 Jan 2014 22:31:43 +0000 (14:31 -0800)]

Merge branch 'PHP-5.6'

* PHP-5.6:
fix test

commit | commitdiff | tree

Stanislav Malyshev [Sun, 26 Jan 2014 22:31:32 +0000 (14:31 -0800)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
fix test

commit | commitdiff | tree

Stanislav Malyshev [Sun, 26 Jan 2014 22:25:49 +0000 (14:25 -0800)]

fix test

commit | commitdiff | tree

Stanislav Malyshev [Sun, 26 Jan 2014 22:26:26 +0000 (14:26 -0800)]

Merge branch 'PHP-5.6'

* PHP-5.6:
fix test

commit | commitdiff | tree

Stanislav Malyshev [Sun, 26 Jan 2014 22:26:01 +0000 (14:26 -0800)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
fix test

commit | commitdiff | tree

Stanislav Malyshev [Sun, 26 Jan 2014 22:25:49 +0000 (14:25 -0800)]

fix test

commit | commitdiff | tree

Stanislav Malyshev [Sun, 26 Jan 2014 20:17:32 +0000 (12:17 -0800)]

Merge branch 'PHP-5.6'

* PHP-5.6:
fix test - new flag ZEND_ACC_HAS_TYPE_HINTS

commit | commitdiff | tree

Stanislav Malyshev [Sun, 26 Jan 2014 08:16:36 +0000 (00:16 -0800)]

fix test - new flag ZEND_ACC_HAS_TYPE_HINTS

commit | commitdiff | tree

Stanislav Malyshev [Sun, 26 Jan 2014 08:16:36 +0000 (00:16 -0800)]

fix test - new flag ZEND_ACC_HAS_TYPE_HINTS

commit | commitdiff | tree

Derick Rethans [Sun, 26 Jan 2014 13:02:55 +0000 (14:02 +0100)]

Merge branch 'PHP-5.6'

commit | commitdiff | tree

Derick Rethans [Sun, 26 Jan 2014 13:02:44 +0000 (14:02 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

commit | commitdiff | tree

Derick Rethans [Sun, 26 Jan 2014 13:02:37 +0000 (14:02 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

commit | commitdiff | tree

Derick Rethans [Sun, 26 Jan 2014 13:02:19 +0000 (14:02 +0100)]

Merge branch '45543-timezone-set' into PHP-5.4

commit | commitdiff | tree

Derick Rethans [Sun, 26 Jan 2014 12:58:13 +0000 (13:58 +0100)]

Fixed bug #45543: DateTime::setTimezone can not set timezones without ID.

commit | commitdiff | tree

Stanislav Malyshev [Sun, 26 Jan 2014 07:27:48 +0000 (23:27 -0800)]

Merge branch 'PHP-5.6'

* PHP-5.6:
fix test bug62479.phpt

commit | commitdiff | tree

Stanislav Malyshev [Sun, 26 Jan 2014 07:27:21 +0000 (23:27 -0800)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
fix test bug62479.phpt

commit | commitdiff | tree

Stanislav Malyshev [Sun, 26 Jan 2014 07:26:29 +0000 (23:26 -0800)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
fix test bug62479.phpt

commit | commitdiff | tree

Stanislav Malyshev [Sun, 26 Jan 2014 06:31:31 +0000 (22:31 -0800)]

fix test bug62479.phpt

commit | commitdiff | tree

Stanislav Malyshev [Sun, 26 Jan 2014 06:05:18 +0000 (22:05 -0800)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Implement ldap_modify_batch.

commit | commitdiff | tree

Stanislav Malyshev [Sun, 26 Jan 2014 06:04:39 +0000 (22:04 -0800)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Implement ldap_modify_batch.

commit | commitdiff | tree

Stanislav Malyshev [Sun, 26 Jan 2014 06:01:15 +0000 (22:01 -0800)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Implement ldap_modify_batch.

Conflicts:
ext/ldap/ldap.c

commit | commitdiff | tree

Stanislav Malyshev [Sun, 26 Jan 2014 05:57:56 +0000 (21:57 -0800)]

Merge branch 'pull-request/571' into PHP-5.4

* pull-request/571:
Implement ldap_modify_batch.

commit | commitdiff | tree

Derick Rethans [Sat, 25 Jan 2014 15:16:42 +0000 (16:16 +0100)]

Merge branch 'PHP-5.6'

commit | commitdiff | tree

Derick Rethans [Sat, 25 Jan 2014 15:16:34 +0000 (16:16 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

commit | commitdiff | tree

Derick Rethans [Sat, 25 Jan 2014 15:16:23 +0000 (16:16 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
ext/date/lib/parse_date.c

commit | commitdiff | tree

Derick Rethans [Sat, 25 Jan 2014 15:15:50 +0000 (16:15 +0100)]

Merge branch '44780-fallback' into PHP-5.4

commit | commitdiff | tree

Derick Rethans [Sat, 25 Jan 2014 15:14:51 +0000 (16:14 +0100)]

Fixed bug #44780: some time zone offsets not recognized by timezone_name_from_abbr.

commit | commitdiff | tree

Ferenc Kovacs [Fri, 24 Jan 2014 15:13:10 +0000 (16:13 +0100)]

Merge branch 'PHP-5.6'

* PHP-5.6:
  fix the primary qa email address and update the list of available people being able to add moderators to our lists
  Revert "Fix #62479: Some chars not parsed in passwords"
  Fix #62479: Some chars not parsed in passwords

commit | commitdiff | tree

Ferenc Kovacs [Fri, 24 Jan 2014 15:12:33 +0000 (16:12 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix the primary qa email address and update the list of available people being able to add moderators to our lists
  Revert "Fix #62479: Some chars not parsed in passwords"
  Fix #62479: Some chars not parsed in passwords

commit | commitdiff | tree

Ferenc Kovacs [Fri, 24 Jan 2014 15:11:56 +0000 (16:11 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix the primary qa email address and update the list of available people being able to add moderators to our lists
  Revert "Fix #62479: Some chars not parsed in passwords"
  Fix #62479: Some chars not parsed in passwords

commit | commitdiff | tree

Ferenc Kovacs [Fri, 24 Jan 2014 15:07:29 +0000 (16:07 +0100)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  fix the primary qa email address and update the list of available people being able to add moderators to our lists
  Revert "Fix #62479: Some chars not parsed in passwords"
  Fix #62479: Some chars not parsed in passwords

commit | commitdiff | tree

Ferenc Kovacs [Fri, 24 Jan 2014 15:06:58 +0000 (16:06 +0100)]

fix the primary qa email address and update the list of available people being able to add moderators to our lists

commit | commitdiff | tree

Andrey Hristov [Fri, 24 Jan 2014 10:31:33 +0000 (12:31 +0200)]

Merge branch 'PHP-5.6'

commit | commitdiff | tree

Andrey Hristov [Fri, 24 Jan 2014 10:31:19 +0000 (12:31 +0200)]

WS

commit | commitdiff | tree

Andrey Hristov [Fri, 24 Jan 2014 10:15:03 +0000 (12:15 +0200)]

Merge branch 'PHP-5.6'

Conflicts:
ext/mysqlnd/mysqlnd_ps_codec.c

commit | commitdiff | tree

Andrey Hristov [Fri, 24 Jan 2014 09:52:35 +0000 (11:52 +0200)]

Reduce code duplication a bit

commit | commitdiff | tree

Andrey Hristov [Fri, 24 Jan 2014 09:39:42 +0000 (11:39 +0200)]

Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6

commit | commitdiff | tree

Andrey Hristov [Fri, 24 Jan 2014 09:39:24 +0000 (11:39 +0200)]

Backport refactoring from php-src

commit | commitdiff | tree

Xinchen Hui [Fri, 24 Jan 2014 02:52:22 +0000 (10:52 +0800)]

Merge branch 'PHP-5.6'

commit | commitdiff | tree

Xinchen Hui [Thu, 26 Dec 2013 09:45:37 +0000 (17:45 +0800)]

Fixed warning "No new line at end of file"

commit | commitdiff | tree

Will Fitch [Fri, 24 Jan 2014 02:36:54 +0000 (21:36 -0500)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Update gitignore and Makefile for additional entries

commit | commitdiff | tree

Will Fitch [Fri, 24 Jan 2014 02:35:24 +0000 (21:35 -0500)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Update gitignore and Makefile for additional entries

commit | commitdiff | tree

Will Fitch [Fri, 24 Jan 2014 02:34:57 +0000 (21:34 -0500)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Update gitignore and Makefile for additional entries

commit | commitdiff | tree

Will Fitch [Fri, 24 Jan 2014 02:28:45 +0000 (21:28 -0500)]

Update gitignore and Makefile for additional entries

commit | commitdiff | tree

Andrey Hristov [Thu, 23 Jan 2014 16:20:13 +0000 (18:20 +0200)]

FIx failing tests because of operator precedence

commit | commitdiff | tree

Anatol Belski [Wed, 22 Jan 2014 22:31:09 +0000 (23:31 +0100)]

Merge branch 'PHP-5.6'

* PHP-5.6:
refixed that test for 5.5+
5.5.10 next

commit | commitdiff | tree

Anatol Belski [Wed, 22 Jan 2014 22:30:52 +0000 (23:30 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
refixed that test for 5.5+
5.5.10 next

commit | commitdiff | tree

Anatol Belski [Wed, 22 Jan 2014 22:30:14 +0000 (23:30 +0100)]

refixed that test for 5.5+

commit | commitdiff | tree

Ondřej Hošek [Wed, 22 Jan 2014 17:54:11 +0000 (18:54 +0100)]

Implement ldap_modify_batch.

commit | commitdiff | tree

Julien Pauli [Wed, 22 Jan 2014 17:28:09 +0000 (18:28 +0100)]

5.5.10 next

commit | commitdiff | tree

Anatol Belski [Wed, 22 Jan 2014 14:41:45 +0000 (15:41 +0100)]

Merge branch 'PHP-5.6'

* PHP-5.6:
fixed test

commit | commitdiff | tree

Anatol Belski [Wed, 22 Jan 2014 14:40:58 +0000 (15:40 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
fixed test

commit | commitdiff | tree

Anatol Belski [Wed, 22 Jan 2014 14:40:19 +0000 (15:40 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
fixed test

commit | commitdiff | tree

Anatol Belski [Wed, 22 Jan 2014 14:39:49 +0000 (15:39 +0100)]

fixed test

commit | commitdiff | tree

Anatol Belski [Wed, 22 Jan 2014 11:05:27 +0000 (12:05 +0100)]

Merge branch 'PHP-5.6'

* PHP-5.6:
fix zts

commit | commitdiff | tree

Anatol Belski [Wed, 22 Jan 2014 11:05:06 +0000 (12:05 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
fix zts

commit | commitdiff | tree

Anatol Belski [Wed, 22 Jan 2014 11:04:25 +0000 (12:04 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
fix zts

commit | commitdiff | tree

Anatol Belski [Wed, 22 Jan 2014 11:03:54 +0000 (12:03 +0100)]

fix zts

commit | commitdiff | tree

Anatol Belski [Wed, 22 Jan 2014 10:54:16 +0000 (11:54 +0100)]

Merge branch 'PHP-5.6'

* PHP-5.6:
fixed missing usleep() prototype in pgsql

commit | commitdiff | tree

Anatol Belski [Wed, 22 Jan 2014 10:53:56 +0000 (11:53 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
fixed missing usleep() prototype in pgsql

commit | commitdiff | tree

Anatol Belski [Wed, 22 Jan 2014 10:53:32 +0000 (11:53 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
fixed missing usleep() prototype in pgsql

commit | commitdiff | tree

Anatol Belski [Wed, 22 Jan 2014 10:52:52 +0000 (11:52 +0100)]

fixed missing usleep() prototype in pgsql

commit | commitdiff | tree

Yasuo Ohgaki [Wed, 22 Jan 2014 10:23:52 +0000 (19:23 +0900)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Fixed previous commit may delete unwanted cookies. Sync tests from upper branches.
Re-fixed bug #66469

commit | commitdiff | tree

Yasuo Ohgaki [Wed, 22 Jan 2014 10:23:17 +0000 (19:23 +0900)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fixed previous commit may delete unwanted cookies.
Re-fixed bug #66469

commit | commitdiff | tree

Yasuo Ohgaki [Wed, 22 Jan 2014 10:23:01 +0000 (19:23 +0900)]

Fixed previous commit may delete unwanted cookies.

commit | commitdiff | tree

Yasuo Ohgaki [Wed, 22 Jan 2014 10:21:25 +0000 (19:21 +0900)]

Fixed previous commit may delete unwanted cookies. Sync tests from upper branches.

commit | commitdiff | tree

Yasuo Ohgaki [Wed, 22 Jan 2014 04:49:13 +0000 (13:49 +0900)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Re-fixed bug #66469

commit | commitdiff | tree

Yasuo Ohgaki [Wed, 22 Jan 2014 04:47:55 +0000 (13:47 +0900)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Re-fixed bug #66469

commit | commitdiff | tree

Yasuo Ohgaki [Wed, 22 Jan 2014 04:46:59 +0000 (13:46 +0900)]

Re-fixed bug #66469

commit | commitdiff | tree

Yasuo Ohgaki [Wed, 22 Jan 2014 04:40:58 +0000 (13:40 +0900)]

Re-fixed bug #66469

commit | commitdiff | tree

Stanislav Malyshev [Tue, 21 Jan 2014 21:29:13 +0000 (13:29 -0800)]

Merge branch 'PHP-5.6'

* PHP-5.6:
  fix CVE ref for bug #66060
  fix CVE ref for bug #66060
  fix buglet in makedist
  5.4.26 next
  fix news

commit | commitdiff | tree

Stanislav Malyshev [Tue, 21 Jan 2014 21:28:32 +0000 (13:28 -0800)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix CVE ref for bug #66060
  fix CVE ref for bug #66060
  fix buglet in makedist
  5.4.26 next
  fix news

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