]> 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.5'
commit | commitdiff | tree
Anatol Belski [Tue, 12 Mar 2013 07:35:49 +0000 (08:35 +0100)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  fixed headers order

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Anatol Belski [Tue, 12 Mar 2013 07:34:48 +0000 (08:34 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fixed headers order

11 years agoMerge branch 'PHP-5.3' into PHP-5.4
commit | commitdiff | tree
Anatol Belski [Tue, 12 Mar 2013 07:34:16 +0000 (08:34 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  fixed headers order

11 years agofixed headers order
commit | commitdiff | tree
Anatol Belski [Tue, 12 Mar 2013 07:33:36 +0000 (08:33 +0100)]
fixed headers order

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Derick Rethans [Mon, 11 Mar 2013 21:36:42 +0000 (21:36 +0000)]
Merge branch 'PHP-5.5'

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Derick Rethans [Mon, 11 Mar 2013 21:36:41 +0000 (21:36 +0000)]
Merge branch 'PHP-5.4' into PHP-5.5

11 years agoMerge branch 'PHP-5.3' into PHP-5.4
commit | commitdiff | tree
Derick Rethans [Mon, 11 Mar 2013 21:36:37 +0000 (21:36 +0000)]
Merge branch 'PHP-5.3' into PHP-5.4

11 years ago- Updated to version 2013.2 (2013b)
commit | commitdiff | tree
Derick Rethans [Mon, 11 Mar 2013 21:36:36 +0000 (21:36 +0000)]
- Updated to version 2013.2 (2013b)

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Anatol Belski [Mon, 11 Mar 2013 15:15:01 +0000 (16:15 +0100)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  fixed the test

11 years agofixed the test
commit | commitdiff | tree
Anatol Belski [Mon, 11 Mar 2013 15:14:39 +0000 (16:14 +0100)]
fixed the test

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Anatol Belski [Mon, 11 Mar 2013 15:05:07 +0000 (16:05 +0100)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed bug #64370 (microtime(true) less than $_SERVER['REQUEST_TIME_FLOAT'])

11 years agoFixed bug #64370 (microtime(true) less than $_SERVER['REQUEST_TIME_FLOAT'])
commit | commitdiff | tree
Anatol Belski [Mon, 11 Mar 2013 15:04:37 +0000 (16:04 +0100)]
Fixed bug #64370 (microtime(true) less than $_SERVER['REQUEST_TIME_FLOAT'])

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Xinchen Hui [Mon, 11 Mar 2013 07:19:59 +0000 (15:19 +0800)]
Merge branch 'PHP-5.5'

Conflicts:
UPGRADING

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Xinchen Hui [Mon, 11 Mar 2013 07:16:47 +0000 (15:16 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5

11 years agoDisable zend_always_inline in debug build
commit | commitdiff | tree
Xinchen Hui [Mon, 11 Mar 2013 07:15:22 +0000 (15:15 +0800)]
Disable zend_always_inline in debug build

it will be much more easier for debuging

11 years agoAdding in NEWS/UPGRADING about process title change support.
commit | commitdiff | tree
Keyur Govande [Mon, 11 Mar 2013 00:20:57 +0000 (00:20 +0000)]
Adding in NEWS/UPGRADING about process title change support.

11 years agoMerge branch 'PHP-5.5' of https://git.php.net/push/php-src into PHP-5.5
commit | commitdiff | tree
Keyur Govande [Mon, 11 Mar 2013 00:05:49 +0000 (00:05 +0000)]
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:
  Fix tests after laruence unserialize change
  Fix get_property_ptr_ptr declaration in simplexml
  Update NEWS
  Fixed confused exception message while user threw exception
  Fixed bug #64354 (Unserialize array of objects whose class can't be autoloaded fail)
  Fix date
  use NEWS only
  Fixed bug #61025 (__invoke() visibility not honored)

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Nikita Popov [Sat, 9 Mar 2013 19:22:29 +0000 (20:22 +0100)]
Merge branch 'PHP-5.5'

11 years agoFix tests after laruence unserialize change
commit | commitdiff | tree
Nikita Popov [Sat, 9 Mar 2013 19:21:33 +0000 (20:21 +0100)]
Fix tests after laruence unserialize change

11 years agoFix get_property_ptr_ptr declaration in simplexml
commit | commitdiff | tree
Nikita Popov [Sat, 9 Mar 2013 19:15:00 +0000 (20:15 +0100)]
Fix get_property_ptr_ptr declaration in simplexml

A new parameter was added to the API and simplexml wasn't adjusted,
thus causing crashes.

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Xinchen Hui [Sat, 9 Mar 2013 15:12:25 +0000 (23:12 +0800)]
Merge branch 'PHP-5.5'

11 years agoUpdate NEWS
commit | commitdiff | tree
Xinchen Hui [Sat, 9 Mar 2013 15:11:48 +0000 (23:11 +0800)]
Update NEWS

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Xinchen Hui [Sat, 9 Mar 2013 15:10:48 +0000 (23:10 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
ext/standard/var_unserializer.c

11 years agoFixed confused exception message while user threw exception
commit | commitdiff | tree
Xinchen Hui [Sat, 9 Mar 2013 15:08:14 +0000 (23:08 +0800)]
Fixed confused exception message while user threw exception

11 years agoFixed bug #64354 (Unserialize array of objects whose class can't be autoloaded fail)
commit | commitdiff | tree
Xinchen Hui [Sat, 9 Mar 2013 15:00:58 +0000 (23:00 +0800)]
Fixed bug #64354 (Unserialize array of objects whose class can't be autoloaded fail)

about the __sleep one, since php_serialize_* are all void function,
so,,only check exception at the very begining

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Xinchen Hui [Sat, 9 Mar 2013 03:38:58 +0000 (11:38 +0800)]
Merge branch 'PHP-5.5'

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Xinchen Hui [Sat, 9 Mar 2013 03:38:32 +0000 (11:38 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5

11 years agoFix date
commit | commitdiff | tree
Xinchen Hui [Sat, 9 Mar 2013 03:37:41 +0000 (11:37 +0800)]
Fix date

11 years agouse NEWS only
commit | commitdiff | tree
David Soria Parra [Fri, 8 Mar 2013 10:12:35 +0000 (11:12 +0100)]
use NEWS only

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Xinchen Hui [Fri, 8 Mar 2013 02:36:13 +0000 (10:36 +0800)]
Merge branch 'PHP-5.5'

Conflicts:
NEWS-5.5

11 years agoFixed bug #61025 (__invoke() visibility not honored)
commit | commitdiff | tree
Xinchen Hui [Fri, 8 Mar 2013 02:34:17 +0000 (10:34 +0800)]
Fixed bug #61025 (__invoke() visibility not honored)

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Keyur Govande [Thu, 7 Mar 2013 23:59:11 +0000 (23:59 +0000)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Support for CLI process title (https://wiki.php.net/rfc/cli_process_title)

11 years agoMerge branch 'pull-request/300' into PHP-5.5
commit | commitdiff | tree
Keyur Govande [Thu, 7 Mar 2013 23:51:37 +0000 (23:51 +0000)]
Merge branch 'pull-request/300' into PHP-5.5

* pull-request/300:
  Support for CLI process title (https://wiki.php.net/rfc/cli_process_title)

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
David Soria Parra [Thu, 7 Mar 2013 22:20:35 +0000 (23:20 +0100)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fix for https://bugs.php.net/bug.php?id=62649

11 years agoFix for https://bugs.php.net/bug.php?id=62649
commit | commitdiff | tree
Ralph Schindler [Tue, 5 Mar 2013 17:24:05 +0000 (11:24 -0600)]
Fix for https://bugs.php.net/bug.php?id=62649

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
David Soria Parra [Thu, 7 Mar 2013 22:05:14 +0000 (23:05 +0100)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Typo fix: recieved to received

11 years agoTypo fix: recieved to received
commit | commitdiff | tree
Carson McDonald [Thu, 7 Mar 2013 13:43:54 +0000 (08:43 -0500)]
Typo fix: recieved to received

11 years agoSupport for CLI process title (https://wiki.php.net/rfc/cli_process_title)
commit | commitdiff | tree
Keyur Govande [Thu, 7 Mar 2013 18:54:34 +0000 (18:54 +0000)]
Support for CLI process title (https://wiki.php.net/rfc/cli_process_title)

A new commit into branch 5.5

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
David Soria Parra [Thu, 7 Mar 2013 11:16:31 +0000 (12:16 +0100)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  News for next beta
  Do another Alpha instead of Beta because of ZO+ RFC being voted on

11 years agoNews for next beta
commit | commitdiff | tree
David Soria Parra [Thu, 7 Mar 2013 11:14:48 +0000 (12:14 +0100)]
News for next beta

11 years agoDo another Alpha instead of Beta because of ZO+ RFC being voted on
commit | commitdiff | tree
David Soria Parra [Thu, 7 Mar 2013 11:14:26 +0000 (12:14 +0100)]
Do another Alpha instead of Beta because of ZO+ RFC being voted on

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
David Soria Parra [Wed, 6 Mar 2013 23:27:48 +0000 (00:27 +0100)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  NEWS for the next beta
  NEWS for PHP 5.5.0 Beta 1

11 years agoNEWS for the next beta
commit | commitdiff | tree
David Soria Parra [Wed, 6 Mar 2013 22:51:27 +0000 (23:51 +0100)]
NEWS for the next beta

11 years agoNEWS for PHP 5.5.0 Beta 1
commit | commitdiff | tree
David Soria Parra [Wed, 6 Mar 2013 21:39:54 +0000 (22:39 +0100)]
NEWS for PHP 5.5.0 Beta 1

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Anatol Belski [Wed, 6 Mar 2013 15:49:33 +0000 (16:49 +0100)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  simplified the previous fix for #64359

11 years agosimplified the previous fix for #64359
commit | commitdiff | tree
Anatol Belski [Wed, 6 Mar 2013 15:48:51 +0000 (16:48 +0100)]
simplified the previous fix for #64359

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Anatol Belski [Wed, 6 Mar 2013 11:39:01 +0000 (12:39 +0100)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed bug #64359 strftime crash with VS2012

11 years agoFixed bug #64359 strftime crash with VS2012
commit | commitdiff | tree
Anatol Belski [Wed, 6 Mar 2013 11:37:57 +0000 (12:37 +0100)]
Fixed bug #64359 strftime crash with VS2012

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Stanislav Malyshev [Wed, 6 Mar 2013 08:45:54 +0000 (00:45 -0800)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  fix NEWS

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Stanislav Malyshev [Wed, 6 Mar 2013 08:45:26 +0000 (00:45 -0800)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix NEWS

11 years agofix NEWS
commit | commitdiff | tree
Stanislav Malyshev [Wed, 6 Mar 2013 08:44:43 +0000 (00:44 -0800)]
fix NEWS

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Xinchen Hui [Tue, 5 Mar 2013 09:18:41 +0000 (17:18 +0800)]
Merge branch 'PHP-5.5'

11 years agoskip if no IPv6 support
commit | commitdiff | tree
Xinchen Hui [Tue, 5 Mar 2013 09:18:13 +0000 (17:18 +0800)]
skip if no IPv6 support

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Xinchen Hui [Tue, 5 Mar 2013 08:57:37 +0000 (16:57 +0800)]
Merge branch 'PHP-5.5'

11 years agoFix tests temporary
commit | commitdiff | tree
Xinchen Hui [Tue, 5 Mar 2013 08:56:00 +0000 (16:56 +0800)]
Fix tests temporary

seems IPV6_PKTINFO are not avaiable in some OS

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Xinchen Hui [Tue, 5 Mar 2013 06:03:47 +0000 (14:03 +0800)]
Merge branch 'PHP-5.5'

11 years agoSkip test on Apple
commit | commitdiff | tree
Xinchen Hui [Tue, 5 Mar 2013 06:02:28 +0000 (14:02 +0800)]
Skip test on Apple

11 years agoRevert "Fixed Bug #64340 (sockets tests failed) Patch by Reeze"
commit | commitdiff | tree
Xinchen Hui [Tue, 5 Mar 2013 05:58:20 +0000 (13:58 +0800)]
Revert "Fixed Bug #64340  (sockets tests failed) Patch by Reeze"

build break, will only leave the test script fix first

This reverts commit f2246f352fc01295c370728d68a9bcd2bb546652.

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Pierre Joye [Mon, 4 Mar 2013 13:14:36 +0000 (14:14 +0100)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  - fix path

11 years ago- fix path
commit | commitdiff | tree
Pierre Joye [Mon, 4 Mar 2013 13:14:09 +0000 (14:14 +0100)]
- fix path

11 years agoMerge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
commit | commitdiff | tree
Pierre Joye [Mon, 4 Mar 2013 13:06:09 +0000 (14:06 +0100)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

11 years ago- damned conflicts
commit | commitdiff | tree
Pierre Joye [Mon, 4 Mar 2013 11:11:20 +0000 (12:11 +0100)]
- damned conflicts

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Pierre Joye [Mon, 4 Mar 2013 11:06:11 +0000 (12:06 +0100)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  - add noisy php logo for autocrop with threshold test

11 years ago- add noisy php logo for autocrop with threshold test
commit | commitdiff | tree
Pierre Joye [Mon, 4 Mar 2013 11:05:59 +0000 (12:05 +0100)]
- add noisy php logo for autocrop with threshold test

11 years agoMerge branch 'master' of git.php.net:php-src
commit | commitdiff | tree
Pierre Joye [Mon, 4 Mar 2013 11:05:13 +0000 (12:05 +0100)]
Merge branch 'master' of git.php.net:php-src

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Pierre Joye [Mon, 4 Mar 2013 11:03:01 +0000 (12:03 +0100)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  - add test for imagecropauto
  - (s)rgb distance works way better for now, re enable threshold
  - disable threshold for now, will enable it again using CIEDE2000
  - add todo for threshold
  - clean and enable threshold
  - add image crop support

Conflicts:
UPGRADING

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Anatol Belski [Mon, 4 Mar 2013 08:15:34 +0000 (09:15 +0100)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed PCRE locale crash in Windows/TS

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Anatol Belski [Mon, 4 Mar 2013 08:15:17 +0000 (09:15 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed PCRE locale crash in Windows/TS

11 years agoMerge branch 'PHP-5.3' into PHP-5.4
commit | commitdiff | tree
Anatol Belski [Mon, 4 Mar 2013 08:14:14 +0000 (09:14 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed PCRE locale crash in Windows/TS

11 years agoFixed PCRE locale crash in Windows/TS
commit | commitdiff | tree
Stephen A. Zarkos [Mon, 4 Mar 2013 08:09:45 +0000 (09:09 +0100)]
Fixed PCRE locale crash in Windows/TS

11 years ago- add test for imagecropauto
commit | commitdiff | tree
Pierre Joye [Mon, 4 Mar 2013 06:26:07 +0000 (07:26 +0100)]
- add test for imagecropauto

11 years agoMerge branch 'typofix' of https://github.com/carsonmcdonald/php-src
commit | commitdiff | tree
Xinchen Hui [Mon, 4 Mar 2013 02:47:30 +0000 (10:47 +0800)]
Merge branch 'typofix' of https://github.com/carsonmcdonald/php-src

12 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Stanislav Malyshev [Sun, 3 Mar 2013 21:24:31 +0000 (13:24 -0800)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  rename NEWS back
  updated NEWS

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Stanislav Malyshev [Sun, 3 Mar 2013 21:24:00 +0000 (13:24 -0800)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  rename NEWS back
  updated NEWS

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
commit | commitdiff | tree
Stanislav Malyshev [Sun, 3 Mar 2013 21:20:57 +0000 (13:20 -0800)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  rename NEWS back
  updated NEWS

12 years agorename NEWS back
commit | commitdiff | tree
Stanislav Malyshev [Sun, 3 Mar 2013 21:18:58 +0000 (13:18 -0800)]
rename NEWS back

12 years agoMerge branch 'master' of git.php.net:php-src
commit | commitdiff | tree
Anatol Belski [Sun, 3 Mar 2013 18:23:26 +0000 (19:23 +0100)]
Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
  Rename to create a NEWS file per version to fix the annoying merging issue with NEWS files.
  Rename to create a NEWS file per version to fix the annoying merging issue with NEWS files.
  Rename to create a NEWS file per version to fix the annoying merging issue with NEWS files.

12 years agoMerge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
commit | commitdiff | tree
Anatol Belski [Sun, 3 Mar 2013 18:23:06 +0000 (19:23 +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:
  Rename to create a NEWS file per version to fix the annoying merging issue with NEWS files.
  Rename to create a NEWS file per version to fix the annoying merging issue with NEWS files.
  Rename to create a NEWS file per version to fix the annoying merging issue with NEWS files.

12 years agoMerge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
commit | commitdiff | tree
Anatol Belski [Sun, 3 Mar 2013 18:22:35 +0000 (19:22 +0100)]
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4

* 'PHP-5.4' of git.php.net:php-src:
  Rename to create a NEWS file per version to fix the annoying merging issue with NEWS files.
  Rename to create a NEWS file per version to fix the annoying merging issue with NEWS files.

12 years agoMerge branch 'PHP-5.3' of git.php.net:php-src into PHP-5.3
commit | commitdiff | tree
Anatol Belski [Sun, 3 Mar 2013 18:21:45 +0000 (19:21 +0100)]
Merge branch 'PHP-5.3' of git.php.net:php-src into PHP-5.3

* 'PHP-5.3' of git.php.net:php-src:
  Rename to create a NEWS file per version to fix the annoying merging issue with NEWS files.

12 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Anatol Belski [Sun, 3 Mar 2013 18:17:14 +0000 (19:17 +0100)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  updated NEWS
  updated NEWS
  This commit was manufactured by cvs2svn to create tag 'NEWS'.

12 years agoupdated NEWS
commit | commitdiff | tree
Anatol Belski [Sun, 3 Mar 2013 18:16:36 +0000 (19:16 +0100)]
updated NEWS

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Anatol Belski [Sun, 3 Mar 2013 18:15:37 +0000 (19:15 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  updated NEWS
  This commit was manufactured by cvs2svn to create tag 'NEWS'.

12 years agoupdated NEWS
commit | commitdiff | tree
Anatol Belski [Sun, 3 Mar 2013 18:14:50 +0000 (19:14 +0100)]
updated NEWS

12 years agoMerge commit 'NEWS' into PHP-5.4
commit | commitdiff | tree
Anatol Belski [Sun, 3 Mar 2013 18:14:17 +0000 (19:14 +0100)]
Merge commit 'NEWS' into PHP-5.4

* commit 'NEWS':
  This commit was manufactured by cvs2svn to create tag 'NEWS'.

12 years agoupdated NEWS
commit | commitdiff | tree
Anatol Belski [Sun, 3 Mar 2013 18:13:38 +0000 (19:13 +0100)]
updated NEWS

12 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Anatol Belski [Sun, 3 Mar 2013 18:11:25 +0000 (19:11 +0100)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  merged PCRE 8.32

12 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Derick Rethans [Sun, 3 Mar 2013 18:10:41 +0000 (13:10 -0500)]
Merge branch 'PHP-5.5'

12 years agoRename to create a NEWS file per version to fix the annoying merging issue with NEWS...
commit | commitdiff | tree
Derick Rethans [Sun, 3 Mar 2013 18:10:24 +0000 (13:10 -0500)]
Rename to create a NEWS file per version to fix the annoying merging issue with NEWS files.

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Anatol Belski [Sun, 3 Mar 2013 18:10:12 +0000 (19:10 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  merged PCRE 8.32

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Derick Rethans [Sun, 3 Mar 2013 18:10:07 +0000 (13:10 -0500)]
Merge branch 'PHP-5.4' into PHP-5.5

12 years agoRename to create a NEWS file per version to fix the annoying merging issue with NEWS...
commit | commitdiff | tree
Derick Rethans [Sun, 3 Mar 2013 18:09:52 +0000 (13:09 -0500)]
Rename to create a NEWS file per version to fix the annoying merging issue with NEWS files.

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
commit | commitdiff | tree
Derick Rethans [Sun, 3 Mar 2013 18:09:31 +0000 (13:09 -0500)]
Merge branch 'PHP-5.3' into PHP-5.4

12 years agoRename to create a NEWS file per version to fix the annoying merging issue with NEWS...
commit | commitdiff | tree
Derick Rethans [Sun, 3 Mar 2013 18:08:19 +0000 (13:08 -0500)]
Rename to create a NEWS file per version to fix the annoying merging issue with NEWS files.

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
commit | commitdiff | tree
Anatol Belski [Sun, 3 Mar 2013 18:07:49 +0000 (19:07 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  merged PCRE 8.32

12 years agomerged PCRE 8.32
commit | commitdiff | tree
Anatol Belski [Sun, 3 Mar 2013 18:06:22 +0000 (19:06 +0100)]
merged PCRE 8.32

- defined HAVE_CONFIG_H to simplify the future merges
- PCRE NEWS http://pcre.org/news.txt

12 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Derick Rethans [Sun, 3 Mar 2013 18:00:42 +0000 (13:00 -0500)]
Merge branch 'PHP-5.5'

Conflicts:
NEWS

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Derick Rethans [Sun, 3 Mar 2013 17:58:42 +0000 (12:58 -0500)]
Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
NEWS

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
commit | commitdiff | tree
Derick Rethans [Sun, 3 Mar 2013 17:53:23 +0000 (12:53 -0500)]
Merge branch 'PHP-5.3' into PHP-5.4

12 years ago- Updated to version 2013.1 (2013a)
commit | commitdiff | tree
Derick Rethans [Sun, 3 Mar 2013 17:53:22 +0000 (12:53 -0500)]
- Updated to version 2013.1 (2013a)

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