delta/php-git.git/ext, branch php-5.5.0alpha1

Fixed sockets ext build on win

2012-11-13T13:53:32+00:00

Merge branch 'PHP-5.4'

2012-11-13T10:17:21+00:00

Merge branch 'PHP-5.3' into PHP-5.4

2012-11-13T10:16:58+00:00

Conflicts:
	NEWS

- Updated to version 2012.10 (2012j)

2012-11-13T10:15:34+00:00

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

2012-11-13T10:10:41+00:00

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

2012-11-13T10:10:28+00:00

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

2012-11-13T10:10:10+00:00

Merge branch 'PHP-5.4'

2012-11-12T12:09:18+00:00

* PHP-5.4:
  Update arginfo for preg_match_all() to reflect reality.
  fix invalid read when trimming empty string

Update arginfo for preg_match_all() to reflect reality.

2012-11-12T12:04:26+00:00

Back when I implemented FR #53238 during the 5.4 development phase to make the
$matches parameter optional in preg_match_all(), it turns out I forgot to
update the arginfo to note that only 2 parameters are now required by
preg_match_all(). The function itself works fine, but reflection was reporting
the wrong number of required parameters.

fix invalid read when trimming empty string

2012-11-11T18:38:18+00:00