]> granicus.if.org Git - php/log
projects / php / log
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
php
11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Stanislav Malyshev [Mon, 14 Apr 2014 22:48:33 +0000 (15:48 -0700)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  fix test - doesn't seem to produce warning
  Fix test - on CI somebody could create a process in the meantime

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Stanislav Malyshev [Mon, 14 Apr 2014 22:47:53 +0000 (15:47 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix test - on CI somebody could create a process in the meantime

11 years agofix test - doesn't seem to produce warning
commit | commitdiff | tree
Stanislav Malyshev [Mon, 14 Apr 2014 22:47:06 +0000 (15:47 -0700)]
fix test - doesn't seem to produce warning

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Stanislav Malyshev [Mon, 14 Apr 2014 22:45:53 +0000 (15:45 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix test - on CI somebody could create a process in the meantime

11 years agoFix test - on CI somebody could create a process in the meantime
commit | commitdiff | tree
Stanislav Malyshev [Mon, 14 Apr 2014 22:43:32 +0000 (15:43 -0700)]
Fix test - on CI somebody could create a process in the meantime

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Anatol Belski [Mon, 14 Apr 2014 21:35:51 +0000 (23:35 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  fix windows build

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Anatol Belski [Mon, 14 Apr 2014 21:34:50 +0000 (23:34 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix windows build

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Anatol Belski [Mon, 14 Apr 2014 21:30:14 +0000 (23:30 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix windows build

11 years agofix windows build
commit | commitdiff | tree
Anatol Belski [Mon, 14 Apr 2014 21:29:38 +0000 (23:29 +0200)]
fix windows build

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Stanislav Malyshev [Mon, 14 Apr 2014 20:38:44 +0000 (13:38 -0700)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix #66942: openssl_seal() memory leak
  ws fix
  Fix #66942: openssl_seal() memory leak
  ws fix

11 years agoFix #66942: openssl_seal() memory leak
commit | commitdiff | tree
Chuan Ma [Tue, 25 Mar 2014 03:24:41 +0000 (23:24 -0400)]
Fix #66942: openssl_seal() memory leak

Fix #66952: memory leak in openssl_open()

11 years agows fix
commit | commitdiff | tree
Stanislav Malyshev [Mon, 14 Apr 2014 20:16:53 +0000 (13:16 -0700)]
ws fix

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Stanislav Malyshev [Mon, 14 Apr 2014 20:36:25 +0000 (13:36 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix #66942: openssl_seal() memory leak
  ws fix

11 years agoFix #66942: openssl_seal() memory leak
commit | commitdiff | tree
Chuan Ma [Tue, 25 Mar 2014 03:24:41 +0000 (23:24 -0400)]
Fix #66942: openssl_seal() memory leak

Fix #66952: memory leak in openssl_open()

11 years agows fix
commit | commitdiff | tree
Stanislav Malyshev [Mon, 14 Apr 2014 20:16:53 +0000 (13:16 -0700)]
ws fix

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Stanislav Malyshev [Mon, 14 Apr 2014 20:35:00 +0000 (13:35 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix #66942: openssl_seal() memory leak
  ws fix

Conflicts:
ext/openssl/openssl.c

11 years agoFix #66942: openssl_seal() memory leak
commit | commitdiff | tree
Chuan Ma [Tue, 25 Mar 2014 03:24:41 +0000 (23:24 -0400)]
Fix #66942: openssl_seal() memory leak

Fix #66952: memory leak in openssl_open()

11 years agows fix
commit | commitdiff | tree
Stanislav Malyshev [Mon, 14 Apr 2014 20:16:53 +0000 (13:16 -0700)]
ws fix

11 years agoMerge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
commit | commitdiff | tree
Andrey Hristov [Mon, 14 Apr 2014 20:11:29 +0000 (23:11 +0300)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

11 years agoMerge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
commit | commitdiff | tree
Andrey Hristov [Mon, 14 Apr 2014 20:11:16 +0000 (23:11 +0300)]
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6

11 years agoMerge branch 'master' of git.php.net:php-src
commit | commitdiff | tree
Andrey Hristov [Mon, 14 Apr 2014 20:11:01 +0000 (23:11 +0300)]
Merge branch 'master' of git.php.net:php-src

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Stanislav Malyshev [Mon, 14 Apr 2014 17:53:09 +0000 (10:53 -0700)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix null byte in LDAP bindings
  Fix bug #66171: better handling of symlinks
  Fix null byte in LDAP bindings
  Fix bug #66171: better handling of symlinks
  Fix null byte in LDAP bindings
  Fix bug #66171: better handling of symlinks

11 years agoFix null byte in LDAP bindings
commit | commitdiff | tree
Stanislav Malyshev [Mon, 14 Apr 2014 03:43:46 +0000 (20:43 -0700)]
Fix null byte in LDAP bindings

11 years agoFix bug #66171: better handling of symlinks
commit | commitdiff | tree
Stanislav Malyshev [Mon, 14 Apr 2014 03:31:20 +0000 (20:31 -0700)]
Fix bug #66171: better handling of symlinks

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Stanislav Malyshev [Mon, 14 Apr 2014 17:51:34 +0000 (10:51 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix null byte in LDAP bindings
  Fix bug #66171: better handling of symlinks
  Fix null byte in LDAP bindings
  Fix bug #66171: better handling of symlinks

11 years agoFix null byte in LDAP bindings
commit | commitdiff | tree
Stanislav Malyshev [Mon, 14 Apr 2014 03:43:46 +0000 (20:43 -0700)]
Fix null byte in LDAP bindings

11 years agoFix bug #66171: better handling of symlinks
commit | commitdiff | tree
Stanislav Malyshev [Mon, 14 Apr 2014 03:31:20 +0000 (20:31 -0700)]
Fix bug #66171: better handling of symlinks

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Stanislav Malyshev [Mon, 14 Apr 2014 17:46:52 +0000 (10:46 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix null byte in LDAP bindings
  Fix bug #66171: better handling of symlinks

11 years agoFix null byte in LDAP bindings
commit | commitdiff | tree
Stanislav Malyshev [Mon, 14 Apr 2014 03:43:46 +0000 (20:43 -0700)]
Fix null byte in LDAP bindings

11 years agoFix bug #66171: better handling of symlinks
commit | commitdiff | tree
Stanislav Malyshev [Mon, 14 Apr 2014 03:31:20 +0000 (20:31 -0700)]
Fix bug #66171: better handling of symlinks

11 years agoFix null byte in LDAP bindings
commit | commitdiff | tree
Stanislav Malyshev [Mon, 14 Apr 2014 03:43:46 +0000 (20:43 -0700)]
Fix null byte in LDAP bindings

11 years agoFix bug #66171: better handling of symlinks
commit | commitdiff | tree
Stanislav Malyshev [Mon, 14 Apr 2014 03:31:20 +0000 (20:31 -0700)]
Fix bug #66171: better handling of symlinks

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Anatol Belski [Mon, 14 Apr 2014 15:45:18 +0000 (17:45 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  fix crash in MINFO when no mysqlnd plugins are loaded

11 years agofix crash in MINFO when no mysqlnd plugins are loaded
commit | commitdiff | tree
Anatol Belski [Mon, 14 Apr 2014 15:44:47 +0000 (17:44 +0200)]
fix crash in MINFO when no mysqlnd plugins are loaded

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Anatol Belski [Mon, 14 Apr 2014 14:45:18 +0000 (16:45 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  backported some ext/intl tests from 5.6 into 5.4

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Andrey Hristov [Mon, 14 Apr 2014 14:44:21 +0000 (17:44 +0300)]
Merge branch 'PHP-5.6'

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Andrey Hristov [Mon, 14 Apr 2014 14:44:13 +0000 (17:44 +0300)]
Merge branch 'PHP-5.5' into PHP-5.6

Conflicts:
ext/mysqli/tests/mysqli_change_user_old.phpt

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Anatol Belski [Mon, 14 Apr 2014 14:42:51 +0000 (16:42 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  backported some ext/intl tests from 5.6 into 5.4

11 years agoAdd test
commit | commitdiff | tree
Andrey Hristov [Mon, 14 Apr 2014 14:35:01 +0000 (17:35 +0300)]
Add test

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Anatol Belski [Mon, 14 Apr 2014 14:34:08 +0000 (16:34 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  backported some ext/intl tests from 5.6 into 5.4

Conflicts:
ext/intl/tests/collator_get_sort_key_variant2.phpt
ext/intl/tests/locale_get_display_name3.phpt

11 years agobackported some ext/intl tests from 5.6 into 5.4
commit | commitdiff | tree
Anatol Belski [Mon, 14 Apr 2014 14:31:18 +0000 (16:31 +0200)]
backported some ext/intl tests from 5.6 into 5.4

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Anatol Belski [Mon, 14 Apr 2014 13:35:01 +0000 (15:35 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  test fixes for ICU 53.1

11 years agotest fixes for ICU 53.1
commit | commitdiff | tree
Anatol Belski [Mon, 14 Apr 2014 13:34:32 +0000 (15:34 +0200)]
test fixes for ICU 53.1

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Anatol Belski [Mon, 14 Apr 2014 07:34:02 +0000 (09:34 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed bug #67033 Remove reference to Windows 95

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Anatol Belski [Mon, 14 Apr 2014 07:33:49 +0000 (09:33 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed bug #67033 Remove reference to Windows 95

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Anatol Belski [Mon, 14 Apr 2014 07:33:31 +0000 (09:33 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #67033 Remove reference to Windows 95

11 years agoFixed bug #67033 Remove reference to Windows 95
commit | commitdiff | tree
Anatol Belski [Mon, 14 Apr 2014 07:32:31 +0000 (09:32 +0200)]
Fixed bug #67033 Remove reference to Windows 95

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Stanislav Malyshev [Mon, 14 Apr 2014 03:17:30 +0000 (20:17 -0700)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  fix NEWS

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Stanislav Malyshev [Mon, 14 Apr 2014 03:17:14 +0000 (20:17 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix NEWS

11 years agoMErge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Stanislav Malyshev [Mon, 14 Apr 2014 03:16:54 +0000 (20:16 -0700)]
MErge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix NEWS

11 years agofix NEWS
commit | commitdiff | tree
Stanislav Malyshev [Mon, 14 Apr 2014 03:16:27 +0000 (20:16 -0700)]
fix NEWS

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Stanislav Malyshev [Mon, 14 Apr 2014 01:56:26 +0000 (18:56 -0700)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix #66021 (Blank line inside empty array/object)

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Stanislav Malyshev [Mon, 14 Apr 2014 01:55:58 +0000 (18:55 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix #66021 (Blank line inside empty array/object)

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Stanislav Malyshev [Mon, 14 Apr 2014 01:54:54 +0000 (18:54 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix #66021 (Blank line inside empty array/object)

11 years agoMerge branch 'pull-request/518' into PHP-5.4
commit | commitdiff | tree
Stanislav Malyshev [Mon, 14 Apr 2014 01:50:39 +0000 (18:50 -0700)]
Merge branch 'pull-request/518' into PHP-5.4

* pull-request/518:
  Fix #66021 (Blank line inside empty array/object)

11 years agoMerge branch 'pull-request/533'
commit | commitdiff | tree
Stanislav Malyshev [Mon, 14 Apr 2014 01:39:58 +0000 (18:39 -0700)]
Merge branch 'pull-request/533'

* pull-request/533:
  Fixed bug 64604

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Stanislav Malyshev [Mon, 14 Apr 2014 01:39:28 +0000 (18:39 -0700)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed bug #64604

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Stanislav Malyshev [Mon, 14 Apr 2014 01:38:45 +0000 (18:38 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed bug #64604

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Stanislav Malyshev [Mon, 14 Apr 2014 01:38:12 +0000 (18:38 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #64604

11 years agoFixed bug #64604
commit | commitdiff | tree
Ingo Walz [Sat, 23 Nov 2013 01:31:23 +0000 (02:31 +0100)]
Fixed bug #64604

11 years agoMerge branch 'pull-request/578'
commit | commitdiff | tree
Stanislav Malyshev [Mon, 14 Apr 2014 01:15:55 +0000 (18:15 -0700)]
Merge branch 'pull-request/578'

* pull-request/578:
  Fix #66562: Consistency bug where curl_multi_getcontent behaves different from curl_exec

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Stanislav Malyshev [Mon, 14 Apr 2014 01:14:10 +0000 (18:14 -0700)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix #66562: Consistency bug where curl_multi_getcontent behaves different from curl_exec

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Stanislav Malyshev [Mon, 14 Apr 2014 01:13:24 +0000 (18:13 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix #66562: Consistency bug where curl_multi_getcontent behaves different from curl_exec

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Stanislav Malyshev [Mon, 14 Apr 2014 01:12:40 +0000 (18:12 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix #66562: Consistency bug where curl_multi_getcontent behaves different from curl_exec

11 years agoFix #66562: Consistency bug where curl_multi_getcontent behaves different from curl_exec
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

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Stanislav Malyshev [Mon, 14 Apr 2014 00:33:02 +0000 (17:33 -0700)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix bug #66482, replace wrong item name 'priority' with 'process.priority' in php-fpm.conf

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Stanislav Malyshev [Mon, 14 Apr 2014 00:32:09 +0000 (17:32 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix bug #66482, replace wrong item name 'priority' with 'process.priority' in php-fpm.conf

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Stanislav Malyshev [Mon, 14 Apr 2014 00:31:14 +0000 (17:31 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix bug #66482, replace wrong item name 'priority' with 'process.priority' in php-fpm.conf

11 years agoFix bug #66482, replace wrong item name 'priority' with 'process.priority' in php...
commit | commitdiff | tree
itxx00 [Thu, 16 Jan 2014 08:34:39 +0000 (16:34 +0800)]
Fix bug #66482, replace wrong item name 'priority' with 'process.priority' in php-fpm.conf

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Stanislav Malyshev [Mon, 14 Apr 2014 00:04:25 +0000 (17:04 -0700)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix windows build

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Stanislav Malyshev [Mon, 14 Apr 2014 00:04:00 +0000 (17:04 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix windows build

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Stanislav Malyshev [Mon, 14 Apr 2014 00:03:28 +0000 (17:03 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix windows build

11 years agoFix windows build
commit | commitdiff | tree
Stanislav Malyshev [Mon, 14 Apr 2014 00:02:21 +0000 (17:02 -0700)]
Fix windows build

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Stanislav Malyshev [Sun, 13 Apr 2014 22:56:02 +0000 (15:56 -0700)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix bug #66721

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Stanislav Malyshev [Sun, 13 Apr 2014 22:55:24 +0000 (15:55 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix bug #66721

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Stanislav Malyshev [Sun, 13 Apr 2014 22:54:26 +0000 (15:54 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix bug #66721

11 years agoFix bug #66721
commit | commitdiff | tree
Boro Sitnikovski [Mon, 17 Feb 2014 00:07:52 +0000 (01:07 +0100)]
Fix bug #66721

Add NULL check to php_date_parse_tzfile's retval

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Stanislav Malyshev [Sun, 13 Apr 2014 22:40:21 +0000 (15:40 -0700)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  fix apr_psprintf format string from e0df4e3dba7c4ab92442b9e82c1de01fdbaa3cce
  Fixed bug #67024 - getimagesize should recognize BMP files with negative height

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Stanislav Malyshev [Sun, 13 Apr 2014 22:38:20 +0000 (15:38 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix apr_psprintf format string from e0df4e3dba7c4ab92442b9e82c1de01fdbaa3cce

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Stanislav Malyshev [Sun, 13 Apr 2014 22:37:19 +0000 (15:37 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix apr_psprintf format string from e0df4e3dba7c4ab92442b9e82c1de01fdbaa3cce

11 years agofix apr_psprintf format string from e0df4e3dba7c4ab92442b9e82c1de01fdbaa3cce
commit | commitdiff | tree
Jeff Trawick [Sun, 13 Apr 2014 20:37:16 +0000 (16:37 -0400)]
fix apr_psprintf format string from e0df4e3dba7c4ab92442b9e82c1de01fdbaa3cce

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Stanislav Malyshev [Sun, 13 Apr 2014 22:24:07 +0000 (15:24 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed bug #67024 - getimagesize should recognize BMP files with negative height

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Stanislav Malyshev [Sun, 13 Apr 2014 22:22:21 +0000 (15:22 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #67024 - getimagesize should recognize BMP files with negative height

11 years agoFixed bug #67024 - getimagesize should recognize BMP files with negative height
commit | commitdiff | tree
Gabor Buella [Fri, 4 Apr 2014 22:17:25 +0000 (00:17 +0200)]
Fixed bug #67024 - getimagesize should recognize BMP files with negative height

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Bob Weinand [Sun, 13 Apr 2014 22:10:25 +0000 (00:10 +0200)]
Merge branch 'PHP-5.6'

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Bob Weinand [Sun, 13 Apr 2014 22:08:36 +0000 (00:08 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Daniel Lowrey [Sun, 13 Apr 2014 21:19:23 +0000 (15:19 -0600)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Bug #66840: Fix broken build when extension built separately

11 years agoBug #66840: Fix broken build when extension built separately
commit | commitdiff | tree
Daniel Lowrey [Sun, 13 Apr 2014 21:17:50 +0000 (15:17 -0600)]
Bug #66840: Fix broken build when extension built separately

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Bob Weinand [Sun, 13 Apr 2014 21:03:53 +0000 (23:03 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

11 years agoReverted to 5a0da281e5a9fa02db18b4822d8b103c65849fa9
commit | commitdiff | tree
Bob Weinand [Sun, 13 Apr 2014 21:01:31 +0000 (23:01 +0200)]
Reverted to 5a0da281e5a9fa02db18b4822d8b103c65849fa9
Discussion: http://news.php.net/php.cvs/76836

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Bob Weinand [Sun, 13 Apr 2014 17:41:27 +0000 (19:41 +0200)]
Merge branch 'PHP-5.6'

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Bob Weinand [Sun, 13 Apr 2014 17:40:39 +0000 (19:40 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Bob Weinand [Sun, 13 Apr 2014 17:37:06 +0000 (19:37 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

11 years agoForgot title in phpt for bug #67064
commit | commitdiff | tree
Bob Weinand [Sun, 13 Apr 2014 17:34:17 +0000 (19:34 +0200)]
Forgot title in phpt for bug #67064

11 years agoUpdated NEWS
commit | commitdiff | tree
Bob Weinand [Sun, 13 Apr 2014 17:32:51 +0000 (19:32 +0200)]
Updated NEWS

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Bob Weinand [Sun, 13 Apr 2014 17:28:32 +0000 (19:28 +0200)]
Merge branch 'PHP-5.6'

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Bob Weinand [Sun, 13 Apr 2014 17:27:43 +0000 (19:27 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Bob Weinand [Sun, 13 Apr 2014 17:25:07 +0000 (19:25 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

11 years agoFix bug #67064 in a BC safe way
commit | commitdiff | tree
Bob Weinand [Sun, 13 Apr 2014 17:19:24 +0000 (19:19 +0200)]
Fix bug #67064 in a BC safe way
You can use an optional parameter now when implementing the Countable interface
to get the $mode passed to count().

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Bob Weinand [Sun, 13 Apr 2014 09:42:30 +0000 (11:42 +0200)]
Merge branch 'PHP-5.6'

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