granicus.if.org Git

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

Stanislav Malyshev [Sun, 16 Jun 2013 22:29:25 +0000 (15:29 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fix bug #64936 - clean doc comment state at the beginning and end of the scan
ws fix

Conflicts:
Zend/zend_language_scanner.c
Zend/zend_language_scanner.l
Zend/zend_language_scanner_defs.h

commit | commitdiff | tree

Stanislav Malyshev [Sun, 16 Jun 2013 22:02:51 +0000 (15:02 -0700)]

Fix bug #64936 - clean doc comment state at the beginning and end of the scan

commit | commitdiff | tree

Stanislav Malyshev [Sun, 16 Jun 2013 21:08:58 +0000 (14:08 -0700)]

ws fix

commit | commitdiff | tree

Anatol Belski [Sun, 16 Jun 2013 22:10:32 +0000 (00:10 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
fix test

commit | commitdiff | tree

Anatol Belski [Sun, 16 Jun 2013 22:09:05 +0000 (00:09 +0200)]

fix test

breach introduced in ac40c0b562b0f90652cadef83968d7305626c377

commit | commitdiff | tree

Xinchen Hui [Sun, 16 Jun 2013 14:56:47 +0000 (22:56 +0800)]

Update NEWS

commit | commitdiff | tree

Xinchen Hui [Sun, 16 Jun 2013 14:56:22 +0000 (22:56 +0800)]

Merge branch 'PHP-5.4' into PHP-5.5

commit | commitdiff | tree

Xinchen Hui [Sun, 16 Jun 2013 14:55:59 +0000 (22:55 +0800)]

Fixed bug #63176 (Segmentation fault when instantiate 2 persistent PDO to the same db server)

commit | commitdiff | tree

Boris Lytochkin [Sat, 15 Jun 2013 20:09:55 +0000 (00:09 +0400)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
fix typo in test

commit | commitdiff | tree

Boris Lytochkin [Sat, 15 Jun 2013 20:09:18 +0000 (00:09 +0400)]

fix typo in test

commit | commitdiff | tree

Boris Lytochkin [Sat, 15 Jun 2013 20:04:00 +0000 (00:04 +0400)]

Merge branch 'PHP-5.5' of https://git.php.net/push/php-src into PHP-5.5

* 'PHP-5.5' of https://git.php.net/push/php-src: (147 commits)
  Fixed bug #63186 (compile failure on netbsd)
  fix test for bug #60322
  ensure the error_reporting level to get expected notice
  fixed tests
  missing tests for bug #53437
  fixed EOL
  added closing ?>
  fix double entry
  Merge branch 'pull-request/341'
  Merge branch 'pull-request/341'
  Merge branch 'pull-request/341'
  split the test for 32 and 64 bit
  typo fixes (argument)
  typo fixes (accommodate, parameter)
  missing colon
  Backported the fix for bug #53437
  Backported the fix for bug #53437
  fixed the test
  Fix a BC breach related to bug #53437
  Fixed bug #64988 (Class loading order affects E_STRICT warning)
  ...

commit | commitdiff | tree

Boris Lytochkin [Sat, 15 Jun 2013 20:03:30 +0000 (00:03 +0400)]

Merge branch 'PHP-5.4' of https://git.php.net/push/php-src into PHP-5.4

* 'PHP-5.4' of https://git.php.net/push/php-src: (76 commits)
  Fixed bug #63186 (compile failure on netbsd)
  fix test for bug #60322
  ensure the error_reporting level to get expected notice
  fixed tests
  missing tests for bug #53437
  fix double entry
  Merge branch 'pull-request/341'
  typo fixes (argument)
  typo fixes (accommodate, parameter)
  missing colon
  Backported the fix for bug #53437
  Backported the fix for bug #53437
  Fixed bug #64988 (Class loading order affects E_STRICT warning)
  Fixed test script
  PHPTests for the DOMDocument::loadHTMLfile method. They cover - The basic behaviour - When the method receives as argument a file which doesn't exist - When the argument is an empty string - When an empty file is loaded - When a not-well formed html file is loaded
  Fix spelling and correct typo.
  Callback has to be restored in MSHUTDOWN
  Update NEWs
  Fixed bug #64997 (Segfault while using RecursiveIteratorIterator on 64-bits systems)
  Fixed merge wrongly
  ...

commit | commitdiff | tree

Matteo Beccati [Fri, 14 Jun 2013 14:55:12 +0000 (16:55 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fixed bug #63186 (compile failure on netbsd)

commit | commitdiff | tree

Matteo Beccati [Fri, 14 Jun 2013 14:54:32 +0000 (16:54 +0200)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
Fixed bug #63186 (compile failure on netbsd)

commit | commitdiff | tree

Matteo Beccati [Fri, 14 Jun 2013 14:51:54 +0000 (16:51 +0200)]

Fixed bug #63186 (compile failure on netbsd)

commit | commitdiff | tree

Stanislav Malyshev [Thu, 13 Jun 2013 17:30:18 +0000 (10:30 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
fix test for bug #60322

commit | commitdiff | tree

Stanislav Malyshev [Thu, 13 Jun 2013 17:23:23 +0000 (10:23 -0700)]

fix test for bug #60322

commit | commitdiff | tree

Anatol Belski [Wed, 12 Jun 2013 11:15:18 +0000 (13:15 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
ensure the error_reporting level to get expected notice

commit | commitdiff | tree

Anatol Belski [Wed, 12 Jun 2013 11:14:53 +0000 (13:14 +0200)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
ensure the error_reporting level to get expected notice

commit | commitdiff | tree

Anatol Belski [Wed, 12 Jun 2013 11:13:48 +0000 (13:13 +0200)]

ensure the error_reporting level to get expected notice

commit | commitdiff | tree

Anatol Belski [Tue, 11 Jun 2013 10:39:50 +0000 (12:39 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
fixed tests

commit | commitdiff | tree

Anatol Belski [Tue, 11 Jun 2013 10:39:28 +0000 (12:39 +0200)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
fixed tests

commit | commitdiff | tree

Anatol Belski [Tue, 11 Jun 2013 10:38:49 +0000 (12:38 +0200)]

fixed tests

commit | commitdiff | tree

Anatol Belski [Tue, 11 Jun 2013 09:24:16 +0000 (11:24 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
missing tests for bug #53437

commit | commitdiff | tree

Anatol Belski [Tue, 11 Jun 2013 09:22:55 +0000 (11:22 +0200)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
missing tests for bug #53437

commit | commitdiff | tree

Anatol Belski [Tue, 11 Jun 2013 09:19:57 +0000 (11:19 +0200)]

missing tests for bug #53437

commit | commitdiff | tree

Anatol Belski [Tue, 11 Jun 2013 06:32:54 +0000 (08:32 +0200)]

fixed EOL

commit | commitdiff | tree

Anatol Belski [Tue, 11 Jun 2013 06:25:38 +0000 (08:25 +0200)]

added closing ?>

commit | commitdiff | tree

Stanislav Malyshev [Tue, 11 Jun 2013 01:16:09 +0000 (18:16 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
fix double entry
Merge branch 'pull-request/341'

commit | commitdiff | tree

Stanislav Malyshev [Tue, 11 Jun 2013 01:15:03 +0000 (18:15 -0700)]

fix double entry

commit | commitdiff | tree

Stanislav Malyshev [Mon, 10 Jun 2013 21:02:42 +0000 (14:02 -0700)]

Merge branch 'pull-request/341'

* pull-request/341: (23 commits)
typofixes

commit | commitdiff | tree

Stanislav Malyshev [Mon, 10 Jun 2013 21:20:18 +0000 (14:20 -0700)]

Merge branch 'pull-request/341'

* pull-request/341: (23 commits)
typofixes

commit | commitdiff | tree

Stanislav Malyshev [Mon, 10 Jun 2013 21:20:18 +0000 (14:20 -0700)]

Merge branch 'pull-request/341'

* pull-request/341: (23 commits)
typofixes

commit | commitdiff | tree

Anatol Belski [Mon, 10 Jun 2013 20:49:30 +0000 (22:49 +0200)]

split the test for 32 and 64 bit

commit | commitdiff | tree

Stanislav Malyshev [Mon, 10 Jun 2013 20:36:41 +0000 (13:36 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
typo fixes (argument)
typo fixes (accommodate, parameter)

commit | commitdiff | tree

Veres Lajos [Mon, 22 Apr 2013 13:05:24 +0000 (14:05 +0100)]

typo fixes (argument)

commit | commitdiff | tree

Veres Lajos [Mon, 22 Apr 2013 12:41:27 +0000 (13:41 +0100)]

typo fixes (accommodate, parameter)

commit | commitdiff | tree

Anatol Belski [Mon, 10 Jun 2013 17:55:30 +0000 (19:55 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
missing colon

commit | commitdiff | tree

Anatol Belski [Mon, 10 Jun 2013 17:55:06 +0000 (19:55 +0200)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
missing colon

commit | commitdiff | tree

Anatol Belski [Mon, 10 Jun 2013 17:54:29 +0000 (19:54 +0200)]

missing colon

commit | commitdiff | tree

Anatol Belski [Mon, 10 Jun 2013 17:53:03 +0000 (19:53 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Backported the fix for bug #53437
Backported the fix for bug #53437

commit | commitdiff | tree

Anatol Belski [Mon, 10 Jun 2013 17:52:29 +0000 (19:52 +0200)]

Backported the fix for bug #53437

commit | commitdiff | tree

Anatol Belski [Mon, 10 Jun 2013 17:49:31 +0000 (19:49 +0200)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
Backported the fix for bug #53437

commit | commitdiff | tree

Anatol Belski [Mon, 10 Jun 2013 17:48:18 +0000 (19:48 +0200)]

Backported the fix for bug #53437

commit | commitdiff | tree

Anatol Belski [Mon, 10 Jun 2013 16:31:18 +0000 (18:31 +0200)]

fixed the test

commit | commitdiff | tree

Anatol Belski [Mon, 10 Jun 2013 15:48:13 +0000 (17:48 +0200)]

Fix a BC breach related to bug #53437

days and special_amount properties are exported as int again

commit | commitdiff | tree

Xinchen Hui [Mon, 10 Jun 2013 13:31:25 +0000 (21:31 +0800)]

Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
Zend/zend_compile.c

commit | commitdiff | tree

Xinchen Hui [Mon, 10 Jun 2013 13:26:11 +0000 (21:26 +0800)]

Fixed bug #64988 (Class loading order affects E_STRICT warning)

commit | commitdiff | tree

Jakub Vrana [Wed, 15 May 2013 19:59:43 +0000 (12:59 -0700)]

Fix image method signatures

commit | commitdiff | tree

Dmitry Stogov [Mon, 10 Jun 2013 08:59:28 +0000 (12:59 +0400)]

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

* 'PHP-5.4' of git.php.net:php-src:
PHPTests for the DOMDocument::loadHTMLfile method. They cover - The basic behaviour - When the method receives as argument a file which doesn't exist - When the argument is an empty string - When an empty file is loaded - When a not-well formed html file is loaded
Fix spelling and correct typo.

commit | commitdiff | tree

Dmitry Stogov [Mon, 10 Jun 2013 08:59:09 +0000 (12:59 +0400)]

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

* 'PHP-5.5' of git.php.net:php-src:
  PHPTests for the DOMDocument::loadHTMLfile method. They cover - The basic behaviour - When the method receives as argument a file which doesn't exist - When the argument is an empty string - When an empty file is loaded - When a not-well formed html file is loaded
  Fix spelling and correct typo.
  Fix spelling and correct typo.

commit | commitdiff | tree

Dmitry Stogov [Mon, 10 Jun 2013 08:55:51 +0000 (12:55 +0400)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fixed test script

commit | commitdiff | tree

Dmitry Stogov [Mon, 10 Jun 2013 08:54:54 +0000 (12:54 +0400)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
Fixed test script

commit | commitdiff | tree

Stanislav Malyshev [Mon, 10 Jun 2013 08:53:29 +0000 (01:53 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
PHPTests for the DOMDocument::loadHTMLfile method. They cover - The basic behaviour - When the method receives as argument a file which doesn't exist - When the argument is an empty string - When an empty file is loaded - When a not-well formed html file is loaded

commit | commitdiff | tree

Dmitry Stogov [Mon, 10 Jun 2013 08:53:19 +0000 (12:53 +0400)]

Fixed test script

commit | commitdiff | tree

Antonio Diaz Ruiz [Mon, 6 May 2013 21:01:18 +0000 (23:01 +0200)]

PHPTests for the DOMDocument::loadHTMLfile method.
They cover
- The basic behaviour
- When the method receives as argument a file which doesn't exist
- When the argument is an empty string
- When an empty file is loaded
- When a not-well formed html file is loaded

It also includes 2 auxilary files
- An empty html file
- A not well formed html file

commit | commitdiff | tree

Stanislav Malyshev [Mon, 10 Jun 2013 08:42:32 +0000 (01:42 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fix spelling and correct typo.

commit | commitdiff | tree

Carson McDonald [Thu, 6 Jun 2013 11:33:33 +0000 (07:33 -0400)]

Fix spelling and correct typo.

commit | commitdiff | tree

Stanislav Malyshev [Mon, 10 Jun 2013 08:41:16 +0000 (01:41 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fix spelling and correct typo.

commit | commitdiff | tree

Carson McDonald [Thu, 6 Jun 2013 11:33:33 +0000 (07:33 -0400)]

Fix spelling and correct typo.

commit | commitdiff | tree

Dmitry Stogov [Mon, 10 Jun 2013 08:34:08 +0000 (12:34 +0400)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Callback has to be restored in MSHUTDOWN

commit | commitdiff | tree

Dmitry Stogov [Mon, 10 Jun 2013 08:32:53 +0000 (12:32 +0400)]

Callback has to be restored in MSHUTDOWN

commit | commitdiff | tree

Dmitry Stogov [Mon, 10 Jun 2013 08:05:20 +0000 (12:05 +0400)]

Fixed comments

commit | commitdiff | tree

Dmitry Stogov [Mon, 10 Jun 2013 07:43:03 +0000 (11:43 +0400)]

Avoid multiple allocations of the same key in different processes

commit | commitdiff | tree

Dmitry Stogov [Mon, 10 Jun 2013 07:22:19 +0000 (11:22 +0400)]

Compact HashTables before storing them in shared memory

commit | commitdiff | tree

Dmitry Stogov [Mon, 10 Jun 2013 06:36:35 +0000 (10:36 +0400)]

Use size_t instead of int

commit | commitdiff | tree

Xinchen Hui [Sun, 9 Jun 2013 14:26:07 +0000 (22:26 +0800)]

Update NEWS

commit | commitdiff | tree

Xinchen Hui [Sun, 9 Jun 2013 14:25:49 +0000 (22:25 +0800)]

Merge branch 'PHP-5.4' into PHP-5.5

commit | commitdiff | tree

Xinchen Hui [Sun, 9 Jun 2013 14:25:28 +0000 (22:25 +0800)]

Update NEWs

commit | commitdiff | tree

Xinchen Hui [Sun, 9 Jun 2013 14:25:07 +0000 (22:25 +0800)]

Merge branch 'PHP-5.3' into PHP-5.4

commit | commitdiff | tree

Xinchen Hui [Sun, 9 Jun 2013 14:24:48 +0000 (22:24 +0800)]

Fixed bug #64997 (Segfault while using RecursiveIteratorIterator on 64-bits systems)

commit | commitdiff | tree

Xinchen Hui [Sun, 9 Jun 2013 06:25:53 +0000 (14:25 +0800)]

Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
Zend/zend_vm_def.h

commit | commitdiff | tree

Xinchen Hui [Sun, 9 Jun 2013 06:24:05 +0000 (14:24 +0800)]

Fixed merge wrongly

commit | commitdiff | tree

Xinchen Hui [Sun, 9 Jun 2013 05:49:43 +0000 (13:49 +0800)]

Update NEWS

commit | commitdiff | tree

Xinchen Hui [Sun, 9 Jun 2013 05:49:26 +0000 (13:49 +0800)]

Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
Zend/zend_vm_def.h

commit | commitdiff | tree

Xinchen Hui [Sun, 9 Jun 2013 05:39:40 +0000 (13:39 +0800)]

Update NEWS

commit | commitdiff | tree

Xinchen Hui [Sun, 9 Jun 2013 05:35:45 +0000 (13:35 +0800)]

Merge branch 'PHP-5.3' into PHP-5.4

commit | commitdiff | tree

Xinchen Hui [Sun, 9 Jun 2013 05:20:40 +0000 (13:20 +0800)]

Fixed bug #64966 (segfault in zend_do_fcall_common_helper_SPEC)

commit | commitdiff | tree

Stanislav Malyshev [Thu, 6 Jun 2013 20:27:25 +0000 (13:27 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
fix 5.4.16 date

commit | commitdiff | tree

Stanislav Malyshev [Thu, 6 Jun 2013 20:27:04 +0000 (13:27 -0700)]

fix 5.4.16 date

commit | commitdiff | tree

Anatol Belski [Thu, 6 Jun 2013 16:57:20 +0000 (18:57 +0200)]

fix NEWS

commit | commitdiff | tree

Anatol Belski [Thu, 6 Jun 2013 16:53:22 +0000 (18:53 +0200)]

updated NEWS

commit | commitdiff | tree

Anatol Belski [Thu, 6 Jun 2013 16:52:39 +0000 (18:52 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
updated NEWS
Fixed bug #64934 Apache2 TS crash with get_browser()

commit | commitdiff | tree

Anatol Belski [Thu, 6 Jun 2013 16:52:05 +0000 (18:52 +0200)]

updated NEWS

commit | commitdiff | tree

Anatol Belski [Thu, 6 Jun 2013 16:51:32 +0000 (18:51 +0200)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
Fixed bug #64934 Apache2 TS crash with get_browser()

commit | commitdiff | tree

Anatol Belski [Thu, 6 Jun 2013 16:49:04 +0000 (18:49 +0200)]

Fixed bug #64934 Apache2 TS crash with get_browser()

In favour of reading the browscap.ini into a true global var
only once in MINIT, the price for that is to deep copy the
any data from it.

commit | commitdiff | tree

David Soria Parra [Wed, 5 Jun 2013 21:08:48 +0000 (23:08 +0200)]

News update

commit | commitdiff | tree

David Soria Parra [Wed, 5 Jun 2013 21:06:51 +0000 (23:06 +0200)]

PHP 5.5.0RC3 NEWS

commit | commitdiff | tree

Johannes Schlüter [Wed, 5 Jun 2013 14:35:14 +0000 (16:35 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

commit | commitdiff | tree

Johannes Schlüter [Wed, 5 Jun 2013 14:34:54 +0000 (16:34 +0200)]

Merge branch 'PHP-5.3' into PHP-5.4

commit | commitdiff | tree

Johannes Schlüter [Wed, 5 Jun 2013 14:34:18 +0000 (16:34 +0200)]

Add NEWS for PHP 5.3.26

commit | commitdiff | tree

Xinchen Hui [Wed, 5 Jun 2013 09:30:57 +0000 (17:30 +0800)]

Update NEWS

commit | commitdiff | tree

Xinchen Hui [Wed, 5 Jun 2013 09:30:09 +0000 (17:30 +0800)]

Merge branch 'PHP-5.4' into PHP-5.5

commit | commitdiff | tree

Xinchen Hui [Wed, 5 Jun 2013 09:29:04 +0000 (17:29 +0800)]

Update NEWS

commit | commitdiff | tree

Xinchen Hui [Wed, 5 Jun 2013 09:26:10 +0000 (17:26 +0800)]

Merge branch 'PHP-5.3' into PHP-5.4

commit | commitdiff | tree

Xinchen Hui [Wed, 5 Jun 2013 09:25:00 +0000 (17:25 +0800)]

Fixed bug #64960 (Segfault in gc_zval_possible_root)

commit | commitdiff | tree

Stanislav Malyshev [Wed, 5 Jun 2013 04:59:51 +0000 (21:59 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
fix CVE-2013-2110 - use correct formula to calculate string size

commit | commitdiff | tree

Stanislav Malyshev [Wed, 5 Jun 2013 04:57:16 +0000 (21:57 -0700)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
fix CVE-2013-2110 - use correct formula to calculate string size

commit | commitdiff | tree

Stanislav Malyshev [Mon, 20 May 2013 07:43:29 +0000 (00:43 -0700)]

fix CVE-2013-2110 - use correct formula to calculate string size

commit | commitdiff | tree

Stanislav Malyshev [Tue, 4 Jun 2013 04:59:09 +0000 (21:59 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
news for dblib fixes
Fix PDO_DBLIB bugs: #64338, #64808, #63638

Conflicts:
ext/pdo_dblib/dblib_driver.c
ext/pdo_dblib/dblib_stmt.c

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

RSS Atom