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

Remi Collet [Wed, 28 Nov 2012 09:32:00 +0000 (10:32 +0100)]

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

* 'PHP-5.5' of git.php.net:php-src:
  updated NEWS
  Fixed bug #63590 Fileinfo delivers ifferent results in TS and NTS under Windows
  This test isn't supposed to pass on windows
  Fixed Bug #63614 (Fatal error on Reflection)

commit | commitdiff | tree

Anatoliy Belsky [Tue, 27 Nov 2012 15:59:27 +0000 (16:59 +0100)]

updated NEWS

commit | commitdiff | tree

Anatoliy Belsky [Tue, 27 Nov 2012 15:55:47 +0000 (16:55 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fixed bug #63590 Fileinfo delivers ifferent results in TS and NTS under Windows

Conflicts:
NEWS

commit | commitdiff | tree

Anatoliy Belsky [Tue, 27 Nov 2012 15:45:25 +0000 (16:45 +0100)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
Fixed bug #63590 Fileinfo delivers ifferent results in TS and NTS under Windows

Conflicts:
NEWS
ext/fileinfo/libmagic.patch
ext/fileinfo/tests/finfo_open_error-win32.phpt

commit | commitdiff | tree

Anatoliy Belsky [Tue, 27 Nov 2012 15:33:58 +0000 (16:33 +0100)]

Fixed bug #63590 Fileinfo delivers ifferent results in TS and NTS under Windows

commit | commitdiff | tree

Anatoliy Belsky [Tue, 27 Nov 2012 15:13:19 +0000 (16:13 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
This test isn't supposed to pass on windows

commit | commitdiff | tree

Anatoliy Belsky [Tue, 27 Nov 2012 15:11:53 +0000 (16:11 +0100)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
This test isn't supposed to pass on windows

commit | commitdiff | tree

Anatoliy Belsky [Tue, 27 Nov 2012 15:02:55 +0000 (16:02 +0100)]

This test isn't supposed to pass on windows

commit | commitdiff | tree

Xinchen Hui [Tue, 27 Nov 2012 05:37:50 +0000 (13:37 +0800)]

Merge branch 'PHP-5.4' into PHP-5.5

commit | commitdiff | tree

Xinchen Hui [Tue, 27 Nov 2012 05:35:41 +0000 (13:35 +0800)]

Merge branch 'PHP-5.3' into PHP-5.4

commit | commitdiff | tree

Xinchen Hui [Tue, 27 Nov 2012 05:34:36 +0000 (13:34 +0800)]

Fixed Bug #63614 (Fatal error on Reflection)

commit | commitdiff | tree

Remi Collet [Mon, 26 Nov 2012 12:05:37 +0000 (13:05 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Related bug #63588 fix length computation + optimize for speed

commit | commitdiff | tree

Remi Collet [Mon, 26 Nov 2012 12:04:04 +0000 (13:04 +0100)]

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

* 'PHP-5.5' of git.php.net:php-src:
count($test_files) already be checked above : if ($test_cnt)

commit | commitdiff | tree

Remi Collet [Mon, 26 Nov 2012 11:59:08 +0000 (12:59 +0100)]

Related bug #63588 fix length computation + optimize for speed

Following comment from Yoram "The patch looks fine, except of testing
for true value of utf16 in each iteration."
Also fix the length computation during check phase.

commit | commitdiff | tree

Xinchen Hui [Sun, 25 Nov 2012 08:19:58 +0000 (16:19 +0800)]

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

commit | commitdiff | tree

Xinchen Hui [Sun, 25 Nov 2012 08:18:20 +0000 (16:18 +0800)]

count($test_files) already be checked above : if ($test_cnt)

thus we can use $sum_results instead of the preg_match

commit | commitdiff | tree

Remi Collet [Sun, 25 Nov 2012 07:21:10 +0000 (08:21 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fixed bug #63588 Duplicate implementation of php_next_utf8_char

commit | commitdiff | tree

Remi Collet [Sun, 25 Nov 2012 07:14:23 +0000 (08:14 +0100)]

Fixed bug #63588 Duplicate implementation of php_next_utf8_char

Json use an utf8 parser from a third party library, switch to
our implementation of php_next_utf8_char.
This also helps on solving #63520. All the unit tests succeed.
Our implementation also seems a little faster.

json.dsp need to be regenerated.

commit | commitdiff | tree

Remi Collet [Sun, 25 Nov 2012 06:48:44 +0000 (07:48 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fixed Bug #63361 Header not installed

commit | commitdiff | tree

Remi Collet [Sun, 25 Nov 2012 06:46:02 +0000 (07:46 +0100)]

Fixed Bug #63361 Header not installed

ext/mysqli/php_mysqli_structs.h is installed and includes
mysqli_mysqlnd.h or mysqli_libmysql.h. So this header must also
be installed.

commit | commitdiff | tree

Remi Collet [Sun, 25 Nov 2012 06:40:39 +0000 (07:40 +0100)]

NEWS entries

commit | commitdiff | tree

Xinchen Hui [Sun, 25 Nov 2012 03:46:35 +0000 (11:46 +0800)]

XFAIL test should not be considered as failed

commit | commitdiff | tree

Xinchen Hui [Sun, 25 Nov 2012 03:45:36 +0000 (11:45 +0800)]

let make test report the run-test result

commit | commitdiff | tree

Stanislav Malyshev [Sun, 25 Nov 2012 00:30:00 +0000 (16:30 -0800)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
fix NEWS
5.4.10-dev

Conflicts:
configure.in
main/php_version.h

commit | commitdiff | tree

Stanislav Malyshev [Sun, 25 Nov 2012 00:28:56 +0000 (16:28 -0800)]

fix NEWS

commit | commitdiff | tree

Stanislav Malyshev [Sat, 10 Nov 2012 08:07:44 +0000 (00:07 -0800)]

5.4.10-dev

commit | commitdiff | tree

Nikita Popov [Sat, 24 Nov 2012 17:21:11 +0000 (18:21 +0100)]

Fix bug #63596: finally in generators segfaults

EX(fast_ret) wasn't initialized in this case so the code ended up
dereferencing an invalid pointer after the jump.

commit | commitdiff | tree

Remi Collet [Sat, 24 Nov 2012 16:56:23 +0000 (17:56 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fixed Bug #63149 Feature missing with system SQLite

commit | commitdiff | tree

Remi Collet [Sat, 24 Nov 2012 16:47:51 +0000 (17:47 +0100)]

Fixed Bug #63149 Feature missing with system SQLite

In pdo_sqlite, getColumnMeta should return the table name.
With bundled SQLite library, -DSQLITE_ENABLE_COLUMN_METADATA=1 (other_flags)
enable the feature in SQLite (function sqlite3_column_table_name).
With system SQLite library, this fix detects if sqlite3_column_table_name is
available and add SQLITE_ENABLE_COLUMN_METADATA macro to get the same behavior.

Test already exists: ext/pdo_sqlite/tests/bug_42589.phpt

commit | commitdiff | tree

Remi Collet [Sat, 24 Nov 2012 16:32:05 +0000 (17:32 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
add unit test for bug 63126
NEWS

commit | commitdiff | tree

Remi Collet [Sat, 24 Nov 2012 16:31:18 +0000 (17:31 +0100)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
add unit test for bug 63126
NEWS

commit | commitdiff | tree

Remi Collet [Sat, 24 Nov 2012 16:30:48 +0000 (17:30 +0100)]

add unit test for bug 63126

commit | commitdiff | tree

Remi Collet [Sat, 24 Nov 2012 14:23:25 +0000 (15:23 +0100)]

NEWS

commit | commitdiff | tree

Remi Collet [Sat, 24 Nov 2012 14:03:09 +0000 (15:03 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fixed Bug #63126 DISABLE_AUTHENTICATOR ignores array

commit | commitdiff | tree

Remi Collet [Sat, 24 Nov 2012 14:01:24 +0000 (15:01 +0100)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
Fixed Bug #63126 DISABLE_AUTHENTICATOR ignores array

commit | commitdiff | tree

Remi Collet [Sat, 24 Nov 2012 14:00:03 +0000 (15:00 +0100)]

Fixed Bug #63126 DISABLE_AUTHENTICATOR ignores array

commit | commitdiff | tree

Anatoliy Belsky [Fri, 23 Nov 2012 13:01:28 +0000 (14:01 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Backported the fix for bug #63248 from 5.4+

commit | commitdiff | tree

Anatoliy Belsky [Fri, 23 Nov 2012 13:00:30 +0000 (14:00 +0100)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
Backported the fix for bug #63248 from 5.4+

commit | commitdiff | tree

Anatoliy Belsky [Fri, 23 Nov 2012 12:58:22 +0000 (13:58 +0100)]

Backported the fix for bug #63248 from 5.4+

commit | commitdiff | tree

Anatoliy Belsky [Thu, 22 Nov 2012 18:05:31 +0000 (19:05 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fixed test for bug #63297

commit | commitdiff | tree

Anatoliy Belsky [Thu, 22 Nov 2012 18:04:49 +0000 (19:04 +0100)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
Fixed test for bug #63297

commit | commitdiff | tree

Anatoliy Belsky [Thu, 22 Nov 2012 18:01:09 +0000 (19:01 +0100)]

Fixed test for bug #63297

commit | commitdiff | tree

Dmitry Stogov [Thu, 22 Nov 2012 11:17:05 +0000 (15:17 +0400)]

Improved "finally" im[plementation

commit | commitdiff | tree

Johannes Schlüter [Wed, 21 Nov 2012 20:11:27 +0000 (21:11 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

commit | commitdiff | tree

Johannes Schlüter [Wed, 21 Nov 2012 20:09:57 +0000 (21:09 +0100)]

Merge branch 'PHP-5.3' into PHP-5.4

commit | commitdiff | tree

Johannes Schlüter [Wed, 21 Nov 2012 20:09:25 +0000 (21:09 +0100)]

PHP 5.3.19

commit | commitdiff | tree

David Soria Parra [Wed, 21 Nov 2012 17:42:01 +0000 (18:42 +0100)]

Add myself to QA

commit | commitdiff | tree

Xinchen Hui [Wed, 21 Nov 2012 04:30:54 +0000 (12:30 +0800)]

Merge branch 'PHP-5.4' into PHP-5.5

commit | commitdiff | tree

Xinchen Hui [Wed, 21 Nov 2012 04:30:03 +0000 (12:30 +0800)]

Unused variable copystr

copystr is declared again blow

commit | commitdiff | tree

Xinchen Hui [Wed, 21 Nov 2012 04:17:41 +0000 (12:17 +0800)]

Update credits for 5.5

commit | commitdiff | tree

Adam Harvey [Wed, 21 Nov 2012 01:25:05 +0000 (09:25 +0800)]

Add the new password functions to UPGRADING.

As a public service announcement on behalf of the documentation team, please
remember to update UPGRADING as well as NEWS when adding features to master or
an alpha branch. :)

commit | commitdiff | tree

Dmitry Stogov [Tue, 20 Nov 2012 08:58:16 +0000 (12:58 +0400)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fixed bug #63468 (wrong called method as callback with inheritance)

Conflicts:
NEWS

commit | commitdiff | tree

Dmitry Stogov [Tue, 20 Nov 2012 08:54:40 +0000 (12:54 +0400)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
Fixed bug #63468 (wrong called method as callback with inheritance)

Conflicts:
NEWS

commit | commitdiff | tree

Dmitry Stogov [Tue, 20 Nov 2012 08:51:55 +0000 (12:51 +0400)]

Fixed bug #63468 (wrong called method as callback with inheritance)

commit | commitdiff | tree

Christopher Jones [Sun, 18 Nov 2012 22:44:00 +0000 (14:44 -0800)]

Merge branch 'add_ver_to_upgrading' into PHP-5.5

* add_ver_to_upgrading:
Add actual branch version number to UPGRADING

commit | commitdiff | tree

Christopher Jones [Sun, 18 Nov 2012 22:43:26 +0000 (14:43 -0800)]

Add actual branch version number to UPGRADING

commit | commitdiff | tree

Christopher Jones [Sun, 18 Nov 2012 22:20:57 +0000 (14:20 -0800)]

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

* 'PHP-5.5' of https://git.php.net/repository/php-src:
  Put the new php.ini directives together.
  Move the deprecated functions up to the Deprecated Functionality section so they're more visible.
  Regenerate Zend ini scanner
  Fixed bug #63512 parse_ini_file() with INI_SCANNER_RAW removes quotes from value

commit | commitdiff | tree

Christopher Jones [Sun, 18 Nov 2012 22:20:53 +0000 (14:20 -0800)]

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

* 'PHP-5.4' of https://git.php.net/repository/php-src:
Regenerate Zend ini scanner
Fixed bug #63512 parse_ini_file() with INI_SCANNER_RAW removes quotes from value

commit | commitdiff | tree

Christopher Jones [Sun, 18 Nov 2012 22:20:49 +0000 (14:20 -0800)]

Merge branch 'PHP-5.3' of https://git.php.net/repository/php-src into PHP-5.3

* 'PHP-5.3' of https://git.php.net/repository/php-src:
Regenerate Zend ini scanner
Fixed bug #63512 parse_ini_file() with INI_SCANNER_RAW removes quotes from value

commit | commitdiff | tree

Adam Harvey [Fri, 16 Nov 2012 04:34:10 +0000 (04:34 +0000)]

Put the new php.ini directives together.

(And make colon usage more consistent.)

commit | commitdiff | tree

Adam Harvey [Fri, 16 Nov 2012 04:33:17 +0000 (04:33 +0000)]

Move the deprecated functions up to the Deprecated Functionality section so
they're more visible.

commit | commitdiff | tree

Pierrick Charron [Fri, 16 Nov 2012 23:28:04 +0000 (18:28 -0500)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Regenerate Zend ini scanner

Conflicts:
Zend/zend_ini_scanner.c
Zend/zend_ini_scanner_defs.h

commit | commitdiff | tree

Pierrick Charron [Fri, 16 Nov 2012 23:24:42 +0000 (18:24 -0500)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
Regenerate Zend ini scanner

Conflicts:
Zend/zend_ini_scanner.c
Zend/zend_ini_scanner_defs.h

commit | commitdiff | tree

Pierrick Charron [Fri, 16 Nov 2012 23:16:21 +0000 (18:16 -0500)]

Regenerate Zend ini scanner

Regenerate both zend_ini_scanner.c and zend_ini_scanner_defs.h

commit | commitdiff | tree

Pierrick Charron [Fri, 16 Nov 2012 23:08:19 +0000 (18:08 -0500)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fixed bug #63512 parse_ini_file() with INI_SCANNER_RAW removes quotes from value

commit | commitdiff | tree

Pierrick Charron [Fri, 16 Nov 2012 23:07:02 +0000 (18:07 -0500)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
Fixed bug #63512 parse_ini_file() with INI_SCANNER_RAW removes quotes from value

commit | commitdiff | tree

Pierrick Charron [Fri, 16 Nov 2012 23:04:14 +0000 (18:04 -0500)]

Fixed bug #63512 parse_ini_file() with INI_SCANNER_RAW removes quotes from value

Restore the old behavior but keep bug 51094 fixed

commit | commitdiff | tree

Christopher Jones [Fri, 16 Nov 2012 03:29:53 +0000 (19:29 -0800)]

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

* 'PHP-5.5' of https://git.php.net/repository/php-src:
  Fixed ext/intl/tests/timezone_createDefault_basic.phpt
  Skip test if directory does not exist
  Fixed ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt
  Fixed test sapi/cli/tests/006.phpt
  Fixed compiler reenterability
  Fixed compiler reenterability
  Updated NEWS
  UPdated NEWS
  Updated NEWS

commit | commitdiff | tree

Christopher Jones [Fri, 16 Nov 2012 03:29:48 +0000 (19:29 -0800)]

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

* 'PHP-5.4' of https://git.php.net/repository/php-src:
  Skip test if directory does not exist
  Fixed test sapi/cli/tests/006.phpt
  Fixed compiler reenterability
  Fixed compiler reenterability
  UPdated NEWS
  Updated NEWS

commit | commitdiff | tree

Christopher Jones [Fri, 16 Nov 2012 03:29:44 +0000 (19:29 -0800)]

Merge branch 'PHP-5.3' of https://git.php.net/repository/php-src into PHP-5.3

* 'PHP-5.3' of https://git.php.net/repository/php-src:
Skip test if directory does not exist
Updated NEWS

commit | commitdiff | tree

Anatoliy Belsky [Thu, 15 Nov 2012 13:31:55 +0000 (14:31 +0100)]

Fixed ext/intl/tests/timezone_createDefault_basic.phpt

Timezone offsets can be negative

commit | commitdiff | tree

Johannes Schlüter [Thu, 15 Nov 2012 11:29:58 +0000 (12:29 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

commit | commitdiff | tree

Johannes Schlüter [Thu, 15 Nov 2012 11:29:38 +0000 (12:29 +0100)]

Merge branch 'PHP-5.3' into PHP-5.4

commit | commitdiff | tree

Johannes Schlüter [Thu, 15 Nov 2012 11:28:19 +0000 (12:28 +0100)]

Skip test if directory does not exist

Would be good to run this using a directory which is existing
everywhere.

commit | commitdiff | tree

Anatoliy Belsky [Wed, 14 Nov 2012 20:18:16 +0000 (21:18 +0100)]

Fixed ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt

There is a constant now which only is there when mysqli with
mysqlnd and pdo_mysql was compiled at the same time, or when
libmysql version > 50605. So checking for that dynamically,
will fail only if there is no mysqli and no connection.

commit | commitdiff | tree

Anatoliy Belsky [Wed, 14 Nov 2012 15:23:36 +0000 (16:23 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fixed test sapi/cli/tests/006.phpt

commit | commitdiff | tree

Anatoliy Belsky [Wed, 14 Nov 2012 15:20:59 +0000 (16:20 +0100)]

Fixed test sapi/cli/tests/006.phpt

Third param in preg_match_all() is optional for a while )

commit | commitdiff | tree

Dmitry Stogov [Wed, 14 Nov 2012 14:03:38 +0000 (18:03 +0400)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fixed compiler reenterability
Fixed compiler reenterability

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

commit | commitdiff | tree

Dmitry Stogov [Wed, 14 Nov 2012 13:47:27 +0000 (17:47 +0400)]

Fixed compiler reenterability

commit | commitdiff | tree

Dmitry Stogov [Wed, 14 Nov 2012 13:45:10 +0000 (17:45 +0400)]

Fixed compiler reenterability

commit | commitdiff | tree

Anatoliy Belsky [Wed, 14 Nov 2012 09:15:42 +0000 (10:15 +0100)]

Updated NEWS

commit | commitdiff | tree

Anatoliy Belsky [Wed, 14 Nov 2012 09:07:55 +0000 (10:07 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
UPdated NEWS
Updated NEWS

commit | commitdiff | tree

Anatoliy Belsky [Wed, 14 Nov 2012 09:06:46 +0000 (10:06 +0100)]

UPdated NEWS

commit | commitdiff | tree

Anatoliy Belsky [Wed, 14 Nov 2012 09:04:27 +0000 (10:04 +0100)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
Updated NEWS

commit | commitdiff | tree

Anatoliy Belsky [Wed, 14 Nov 2012 09:02:35 +0000 (10:02 +0100)]

Updated NEWS

commit | commitdiff | tree

David Soria Parra [Tue, 13 Nov 2012 19:56:17 +0000 (20:56 +0100)]

Bump API versions

commit | commitdiff | tree

Anatoliy Belsky [Tue, 13 Nov 2012 18:48:34 +0000 (19:48 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Enabled apache 2.4 handler build option

commit | commitdiff | tree

Anatoliy Belsky [Tue, 13 Nov 2012 18:40:22 +0000 (19:40 +0100)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
Enabled apache 2.4 handler build option

Conflicts:
sapi/apache2handler/config.w32

commit | commitdiff | tree

Pierre Joye [Tue, 13 Nov 2012 18:34:00 +0000 (19:34 +0100)]

Enabled apache 2.4 handler build option

commit | commitdiff | tree

David Soria Parra [Mon, 12 Nov 2012 16:47:15 +0000 (17:47 +0100)]

Build .xz archive during makedist

commit | commitdiff | tree

David Soria Parra [Mon, 12 Nov 2012 13:29:32 +0000 (14:29 +0100)]

NEWS: remove dots at the end of the NEWS file

commit | commitdiff | tree

David Soria Parra [Mon, 12 Nov 2012 12:45:30 +0000 (13:45 +0100)]

PHP-5.5 is open

commit | commitdiff | tree

David Soria Parra [Mon, 12 Nov 2012 12:45:15 +0000 (13:45 +0100)]

Add missing parts from UPGRADING to NEWS

commit | commitdiff | tree

Anatoliy Belsky [Tue, 13 Nov 2012 13:53:32 +0000 (14:53 +0100)]

Fixed sockets ext build on win

commit | commitdiff | tree

Derick Rethans [Tue, 13 Nov 2012 10:17:21 +0000 (10:17 +0000)]

Merge branch 'PHP-5.4'

commit | commitdiff | tree

Derick Rethans [Tue, 13 Nov 2012 10:16:58 +0000 (10:16 +0000)]

Merge branch 'PHP-5.3' into PHP-5.4

Conflicts:
NEWS

commit | commitdiff | tree

Derick Rethans [Tue, 13 Nov 2012 10:15:34 +0000 (10:15 +0000)]

- Updated to version 2012.10 (2012j)

commit | commitdiff | tree

Derick Rethans [Tue, 13 Nov 2012 10:10:41 +0000 (10:10 +0000)]

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

commit | commitdiff | tree

Derick Rethans [Tue, 13 Nov 2012 10:10:28 +0000 (10:10 +0000)]

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

commit | commitdiff | tree

Derick Rethans [Tue, 13 Nov 2012 10:10:10 +0000 (10:10 +0000)]

Merge branch 'master' of git.php.net:/php-src

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