]> granicus.if.org Git - php/log
projects / php / log
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
php
11 years agofix 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

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Derick Rethans [Sun, 26 Jan 2014 13:02:55 +0000 (14:02 +0100)]
Merge branch 'PHP-5.6'

11 years agoMerge branch 'PHP-5.5' into 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

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
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

11 years agoMerge branch '45543-timezone-set' into PHP-5.4
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

11 years agoFixed bug #45543: DateTime::setTimezone can not set timezones without ID.
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.

11 years agoMerge branch 'PHP-5.6'
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

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
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

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
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

11 years agofix test bug62479.phpt
commit | commitdiff | tree
Stanislav Malyshev [Sun, 26 Jan 2014 06:31:31 +0000 (22:31 -0800)]
fix test bug62479.phpt

11 years agoMerge branch 'PHP-5.6'
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.

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
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.

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
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

11 years agoMerge branch 'pull-request/571' into PHP-5.4
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.

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Derick Rethans [Sat, 25 Jan 2014 15:16:42 +0000 (16:16 +0100)]
Merge branch 'PHP-5.6'

11 years agoMerge branch 'PHP-5.5' into 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

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
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

11 years agoMerge branch '44780-fallback' into PHP-5.4
commit | commitdiff | tree
Derick Rethans [Sat, 25 Jan 2014 15:15:50 +0000 (16:15 +0100)]
Merge branch '44780-fallback' into PHP-5.4

11 years agoFixed bug #44780: some time zone offsets not recognized by timezone_name_from_abbr.
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.

11 years agoMerge branch 'PHP-5.6'
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

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
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

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
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

11 years agoMerge branch 'PHP-5.3' into PHP-5.4
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

11 years agofix the primary qa email address and update the list of available people being able...
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

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Andrey Hristov [Fri, 24 Jan 2014 10:31:33 +0000 (12:31 +0200)]
Merge branch 'PHP-5.6'

11 years agoWS
commit | commitdiff | tree
Andrey Hristov [Fri, 24 Jan 2014 10:31:19 +0000 (12:31 +0200)]
WS

11 years agoMerge branch 'PHP-5.6'
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

11 years agoReduce code duplication a bit
commit | commitdiff | tree
Andrey Hristov [Fri, 24 Jan 2014 09:52:35 +0000 (11:52 +0200)]
Reduce code duplication a bit

11 years agoMerge 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:42 +0000 (11:39 +0200)]
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6

11 years agoBackport refactoring from php-src
commit | commitdiff | tree
Andrey Hristov [Fri, 24 Jan 2014 09:39:24 +0000 (11:39 +0200)]
Backport refactoring from php-src

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Xinchen Hui [Fri, 24 Jan 2014 02:52:22 +0000 (10:52 +0800)]
Merge branch 'PHP-5.6'

11 years agoFixed warning "No new line at end of file"
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"

11 years agoMerge branch 'PHP-5.6'
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

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
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

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
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

11 years agoUpdate 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

11 years agoFIx failing tests because of operator precedence
commit | commitdiff | tree
Andrey Hristov [Thu, 23 Jan 2014 16:20:13 +0000 (18:20 +0200)]
FIx failing tests because of operator precedence

11 years agoMerge branch 'PHP-5.6'
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

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
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

11 years agorefixed that test for 5.5+
commit | commitdiff | tree
Anatol Belski [Wed, 22 Jan 2014 22:30:14 +0000 (23:30 +0100)]
refixed that test for 5.5+

11 years agoImplement ldap_modify_batch.
commit | commitdiff | tree
Ondřej Hošek [Wed, 22 Jan 2014 17:54:11 +0000 (18:54 +0100)]
Implement ldap_modify_batch.

11 years ago5.5.10 next
commit | commitdiff | tree
Julien Pauli [Wed, 22 Jan 2014 17:28:09 +0000 (18:28 +0100)]
5.5.10 next

11 years agoMerge branch 'PHP-5.6'
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

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
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

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
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

11 years agofixed test
commit | commitdiff | tree
Anatol Belski [Wed, 22 Jan 2014 14:39:49 +0000 (15:39 +0100)]
fixed test

11 years agoMerge branch 'PHP-5.6'
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

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
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

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
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

11 years agofix zts
commit | commitdiff | tree
Anatol Belski [Wed, 22 Jan 2014 11:03:54 +0000 (12:03 +0100)]
fix zts

11 years agoMerge branch 'PHP-5.6'
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

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
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

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
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

11 years agofixed 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

11 years agoMerge branch 'PHP-5.6'
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

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
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

11 years agoFixed previous commit may delete unwanted cookies.
commit | commitdiff | tree
Yasuo Ohgaki [Wed, 22 Jan 2014 10:23:01 +0000 (19:23 +0900)]
Fixed previous commit may delete unwanted cookies.

11 years agoFixed previous commit may delete unwanted cookies. Sync tests from upper branches.
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.

11 years agoMerge branch 'PHP-5.6'
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

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
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

11 years agoRe-fixed bug #66469
commit | commitdiff | tree
Yasuo Ohgaki [Wed, 22 Jan 2014 04:46:59 +0000 (13:46 +0900)]
Re-fixed bug #66469

11 years agoRe-fixed bug #66469
commit | commitdiff | tree
Yasuo Ohgaki [Wed, 22 Jan 2014 04:40:58 +0000 (13:40 +0900)]
Re-fixed bug #66469

11 years agoMerge branch 'PHP-5.6'
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

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
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

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Stanislav Malyshev [Tue, 21 Jan 2014 21:28:03 +0000 (13:28 -0800)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix CVE ref for bug #66060
  5.4.26 next
  fix news

Conflicts:
configure.in
main/php_version.h

11 years agofix CVE ref for bug #66060
commit | commitdiff | tree
Stanislav Malyshev [Tue, 21 Jan 2014 21:27:18 +0000 (13:27 -0800)]
fix CVE ref for bug #66060

11 years agofix CVE ref for bug #66060
commit | commitdiff | tree
Stanislav Malyshev [Tue, 21 Jan 2014 21:26:56 +0000 (13:26 -0800)]
fix CVE ref for bug #66060

11 years agofix buglet in makedist
commit | commitdiff | tree
Stanislav Malyshev [Tue, 21 Jan 2014 21:24:52 +0000 (13:24 -0800)]
fix buglet in makedist

11 years ago5.4.26 next
commit | commitdiff | tree
Stanislav Malyshev [Tue, 21 Jan 2014 20:13:42 +0000 (12:13 -0800)]
5.4.26 next

11 years agofix news
commit | commitdiff | tree
Stanislav Malyshev [Tue, 21 Jan 2014 20:11:59 +0000 (12:11 -0800)]
fix news

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Anatol Belski [Tue, 21 Jan 2014 16:15:12 +0000 (17:15 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  fixed post deactivate signature in ext\libxml

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Anatol Belski [Tue, 21 Jan 2014 16:14:56 +0000 (17:14 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fixed post deactivate signature in ext\libxml

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Anatol Belski [Tue, 21 Jan 2014 16:14:32 +0000 (17:14 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fixed post deactivate signature in ext\libxml

11 years agofixed post deactivate signature in ext\libxml
commit | commitdiff | tree
Anatol Belski [Tue, 21 Jan 2014 16:08:59 +0000 (17:08 +0100)]
fixed post deactivate signature in ext\libxml

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Johannes Schlüter [Tue, 21 Jan 2014 15:40:13 +0000 (16:40 +0100)]
Merge branch 'PHP-5.6'

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Johannes Schlüter [Tue, 21 Jan 2014 15:38:32 +0000 (16:38 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Johannes Schlüter [Tue, 21 Jan 2014 15:37:02 +0000 (16:37 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

11 years agofix NEWS formatting
commit | commitdiff | tree
Johannes Schlüter [Tue, 21 Jan 2014 15:35:51 +0000 (16:35 +0100)]
fix NEWS formatting

11 years agoFix bug #66283 (Segmentation fault after memory_limit)
commit | commitdiff | tree
Johannes Schlüter [Tue, 21 Jan 2014 15:28:30 +0000 (16:28 +0100)]
Fix bug #66283 (Segmentation fault after memory_limit)

There are situations where mysqlnd dupliates zvals while freeing result
sets. If the memory_limit is reached during this operation the engine
will bailout. This patch makes sure that a later attempt (during
RSHIUTDOWN) won't cause a double free, instead we rely on the engine to
free emalloc()ed memory after bailout.

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
David Soria Parra [Tue, 21 Jan 2014 15:20:14 +0000 (16:20 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Change automaticaly to automatically

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
David Soria Parra [Tue, 21 Jan 2014 15:20:08 +0000 (16:20 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Change automaticaly to automatically

11 years agoChange automaticaly to automatically
commit | commitdiff | tree
Carson McDonald [Thu, 19 Dec 2013 18:57:26 +0000 (13:57 -0500)]
Change automaticaly to automatically

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Ferenc Kovacs [Tue, 21 Jan 2014 10:21:28 +0000 (11:21 +0100)]
Merge branch 'PHP-5.6'

11 years agostarting a new NEWS section for alpha2
commit | commitdiff | tree
Ferenc Kovacs [Tue, 21 Jan 2014 10:20:40 +0000 (11:20 +0100)]
starting a new NEWS section for alpha2

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Ferenc Kovacs [Tue, 21 Jan 2014 01:29:11 +0000 (02:29 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  fix these tests so they properly clean up after themselves.

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Ferenc Kovacs [Tue, 21 Jan 2014 01:28:49 +0000 (02:28 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix these tests so they properly clean up after themselves.

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Ferenc Kovacs [Tue, 21 Jan 2014 01:28:32 +0000 (02:28 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix these tests so they properly clean up after themselves.

11 years agoUpdating NEWS with PDO change
commit | commitdiff | tree
Will Fitch [Mon, 20 Jan 2014 17:19:42 +0000 (12:19 -0500)]
Updating NEWS with PDO change

11 years agoUpdating NEWS with 66509 change
commit | commitdiff | tree
Will Fitch [Mon, 20 Jan 2014 17:18:20 +0000 (12:18 -0500)]
Updating NEWS with 66509 change

11 years agofix these tests so they properly clean up after themselves.
commit | commitdiff | tree
Ferenc Kovacs [Mon, 20 Jan 2014 17:04:35 +0000 (18:04 +0100)]
fix these tests so they properly clean up after themselves.

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Remi Collet [Mon, 20 Jan 2014 13:44:43 +0000 (14:44 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Skip those test which fails on ARM architecture
  dos2unix

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Remi Collet [Mon, 20 Jan 2014 13:44:32 +0000 (14:44 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Skip those test which fails on ARM architecture
  dos2unix

11 years agoSkip those test which fails on ARM architecture
commit | commitdiff | tree
Remi Collet [Mon, 20 Jan 2014 13:42:28 +0000 (14:42 +0100)]
Skip those test which fails on ARM architecture

Add minimal tests for all arch.

11 years agodos2unix
commit | commitdiff | tree
Remi Collet [Mon, 20 Jan 2014 13:39:05 +0000 (14:39 +0100)]
dos2unix

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Xinchen Hui [Mon, 20 Jan 2014 13:25:42 +0000 (21:25 +0800)]
Merge branch 'PHP-5.6'

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Xinchen Hui [Mon, 20 Jan 2014 13:25:26 +0000 (21:25 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6

11 years agorelease 7.0.3
commit | commitdiff | tree
Xinchen Hui [Mon, 20 Jan 2014 13:23:23 +0000 (21:23 +0800)]
release 7.0.3

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Anatol Belski [Mon, 20 Jan 2014 09:13:22 +0000 (10:13 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  fixed glob compilation with vc12

11 years agofixed glob compilation with vc12
commit | commitdiff | tree
Anatol Belski [Mon, 20 Jan 2014 09:11:31 +0000 (10:11 +0100)]
fixed glob compilation with vc12

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Anatol Belski [Mon, 20 Jan 2014 09:05:37 +0000 (10:05 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  support for Visual C+ 2013

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