]> granicus.if.org Git - php/log
projects / php / log
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
php
12 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Andrey Hristov [Wed, 9 Jan 2013 13:51:02 +0000 (14:51 +0100)]
Merge branch 'PHP-5.5'

12 years agoAdd new constants
commit | commitdiff | tree
Andrey Hristov [Wed, 9 Jan 2013 13:50:43 +0000 (14:50 +0100)]
Add new constants

12 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Dmitry Stogov [Wed, 9 Jan 2013 07:33:44 +0000 (11:33 +0400)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed bug #63882 (zend_std_compare_objects crash on recursion)

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Dmitry Stogov [Wed, 9 Jan 2013 07:32:40 +0000 (11:32 +0400)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #63882 (zend_std_compare_objects crash on recursion)

Conflicts:
NEWS

12 years agoFixed bug #63882 (zend_std_compare_objects crash on recursion)
commit | commitdiff | tree
Dmitry Stogov [Wed, 9 Jan 2013 07:30:50 +0000 (11:30 +0400)]
Fixed bug #63882 (zend_std_compare_objects crash on recursion)

12 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Xinchen Hui [Wed, 9 Jan 2013 02:58:27 +0000 (10:58 +0800)]
Merge branch 'PHP-5.5'

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Xinchen Hui [Wed, 9 Jan 2013 02:57:47 +0000 (10:57 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5

12 years agoupdate NEWS
commit | commitdiff | tree
Xinchen Hui [Wed, 9 Jan 2013 02:55:50 +0000 (10:55 +0800)]
update NEWS

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
commit | commitdiff | tree
Xinchen Hui [Wed, 9 Jan 2013 02:54:23 +0000 (10:54 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4

12 years agoFixed bug #63943 (Bad warning text from strpos() on empty needle)
commit | commitdiff | tree
Xinchen Hui [Wed, 9 Jan 2013 02:53:20 +0000 (10:53 +0800)]
Fixed bug #63943 (Bad warning text from strpos() on empty needle)

12 years agoFix a typo in the ZipArchive error messages
commit | commitdiff | tree
Joey Smith [Tue, 8 Jan 2013 21:18:31 +0000 (14:18 -0700)]
Fix a typo in the ZipArchive error messages

12 years agoMerge branch 'master' of git.php.net:php-src
commit | commitdiff | tree
Pierre Joye [Tue, 8 Jan 2013 14:21:41 +0000 (15:21 +0100)]
Merge branch 'master' of git.php.net:php-src

12 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Pierre Joye [Tue, 8 Jan 2013 14:16:35 +0000 (15:16 +0100)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  - fix bug #47358, glob returns error, should be empty array()
  - NEWS entry for #50524

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Pierre Joye [Tue, 8 Jan 2013 14:13:40 +0000 (15:13 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  - fix bug #47358, glob returns error, should be empty array()
  - NEWS entry for #50524

12 years ago- fix bug #47358, glob returns error, should be empty array()
commit | commitdiff | tree
Pierre Joye [Tue, 8 Jan 2013 14:06:58 +0000 (15:06 +0100)]
- fix bug #47358, glob returns error, should be empty array()

12 years ago- fix bug #47358, glob returns error, should be empty array()
commit | commitdiff | tree
Pierre Joye [Tue, 8 Jan 2013 14:02:04 +0000 (15:02 +0100)]
- fix bug #47358, glob returns error, should be empty array()

12 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Adam Harvey [Tue, 8 Jan 2013 03:45:49 +0000 (11:45 +0800)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Add NEWS for the previously cherry picked commit.
  sapi/litespeed/lsapi_main.c: Fix bug #63228

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Adam Harvey [Tue, 8 Jan 2013 03:45:26 +0000 (11:45 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Add NEWS for the previously cherry picked commit.
  sapi/litespeed/lsapi_main.c: Fix bug #63228

Conflicts:
sapi/litespeed/lsapi_main.c

12 years agoAdd NEWS for the previously cherry picked commit.
commit | commitdiff | tree
Adam Harvey [Tue, 8 Jan 2013 03:40:51 +0000 (11:40 +0800)]
Add NEWS for the previously cherry picked commit.

12 years agosapi/litespeed/lsapi_main.c: Fix bug #63228
commit | commitdiff | tree
George Wang [Fri, 12 Oct 2012 17:04:22 +0000 (13:04 -0400)]
sapi/litespeed/lsapi_main.c: Fix bug #63228

Fix compiling error at line 606 (error: format not a string
literal and no format arguments [-Werror=format-security]

12 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Andrey Hristov [Mon, 7 Jan 2013 15:46:16 +0000 (16:46 +0100)]
Merge branch 'PHP-5.5'

Conflicts:
NEWS

12 years agofix different values of mysqli_stmt_affected_rows between libmysql
commit | commitdiff | tree
Andrey Hristov [Mon, 7 Jan 2013 15:36:21 +0000 (16:36 +0100)]
fix different values of mysqli_stmt_affected_rows between libmysql
and mysqlnd (in favor of libmysql) before execute and after prepare()

12 years ago- NEWS entry for #50524
commit | commitdiff | tree
Pierre Joye [Mon, 7 Jan 2013 12:09:20 +0000 (13:09 +0100)]
- NEWS entry for #50524

12 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Pierre Joye [Mon, 7 Jan 2013 12:04:40 +0000 (13:04 +0100)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  - fix the fix for bug #50524

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Pierre Joye [Mon, 7 Jan 2013 12:04:29 +0000 (13:04 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  - fix the fix for bug #50524

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
commit | commitdiff | tree
Pierre Joye [Mon, 7 Jan 2013 12:04:04 +0000 (13:04 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  - fix the fix for bug #50524

12 years ago- fix the fix for bug #50524
commit | commitdiff | tree
Pierre Joye [Mon, 7 Jan 2013 12:03:12 +0000 (13:03 +0100)]
- fix the fix for bug #50524

12 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Anatoliy Belsky [Sun, 6 Jan 2013 17:42:06 +0000 (18:42 +0100)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  fix windows build
  News entry for bug #52126

Conflicts:
NEWS

12 years agofix windows build
commit | commitdiff | tree
Anatoliy Belsky [Sun, 6 Jan 2013 17:37:26 +0000 (18:37 +0100)]
fix windows build

12 years agoMerge branch 'master' of git.php.net:/php-src
commit | commitdiff | tree
Derick Rethans [Sun, 6 Jan 2013 15:10:36 +0000 (15:10 +0000)]
Merge branch 'master' of git.php.net:/php-src

12 years agoMerge branch 'PHP-5.5' of git.php.net:/php-src into PHP-5.5
commit | commitdiff | tree
Derick Rethans [Sun, 6 Jan 2013 15:10:16 +0000 (15:10 +0000)]
Merge branch 'PHP-5.5' of git.php.net:/php-src into PHP-5.5

12 years agoMerge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4
commit | commitdiff | tree
Derick Rethans [Sun, 6 Jan 2013 15:09:55 +0000 (15:09 +0000)]
Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4

12 years agoUpdate news with new bug fix.
commit | commitdiff | tree
Derick Rethans [Sun, 6 Jan 2013 15:08:26 +0000 (15:08 +0000)]
Update news with new bug fix.

12 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Derick Rethans [Sun, 6 Jan 2013 15:07:34 +0000 (15:07 +0000)]
Merge branch 'PHP-5.5'

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Derick Rethans [Sun, 6 Jan 2013 15:07:25 +0000 (15:07 +0000)]
Merge branch 'PHP-5.4' into PHP-5.5

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
commit | commitdiff | tree
Derick Rethans [Sun, 6 Jan 2013 15:07:13 +0000 (15:07 +0000)]
Merge branch 'PHP-5.3' into PHP-5.4

12 years agoNews entry for bug #52126
commit | commitdiff | tree
Lars Strojny [Sun, 6 Jan 2013 14:13:32 +0000 (15:13 +0100)]
News entry for bug #52126

12 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Lars Strojny [Sun, 6 Jan 2013 14:12:07 +0000 (15:12 +0100)]
Merge branch 'PHP-5.5'

12 years agoAdd unit test for mail.log ini setting.
commit | commitdiff | tree
Martin Jansen [Sun, 6 Jan 2013 07:59:10 +0000 (08:59 +0100)]
Add unit test for mail.log ini setting.

12 years agoAdd a timestamp to the mail log.
commit | commitdiff | tree
Martin Jansen [Mon, 24 Dec 2012 10:11:28 +0000 (11:11 +0100)]
Add a timestamp to the mail log.

This patch is loosely based on the one in bug #52126 but instead of
using a UNIX timestamp it uses the date format also being used by
error_log et al.

12 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Lars Strojny [Sun, 6 Jan 2013 13:55:05 +0000 (14:55 +0100)]
Merge branch 'PHP-5.5'

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Lars Strojny [Sun, 6 Jan 2013 13:54:40 +0000 (14:54 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

12 years agoAdding test for bug #63462
commit | commitdiff | tree
Lars Strojny [Sun, 6 Jan 2013 13:46:49 +0000 (14:46 +0100)]
Adding test for bug #63462

12 years agoFixed bug #55397: Comparsion of incomplete DateTime causes SIGSEGV.
commit | commitdiff | tree
Derick Rethans [Sun, 6 Jan 2013 13:38:22 +0000 (13:38 +0000)]
Fixed bug #55397: Comparsion of incomplete DateTime causes SIGSEGV.

12 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Lars Strojny [Sun, 6 Jan 2013 13:12:19 +0000 (14:12 +0100)]
Merge branch 'PHP-5.5'

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Lars Strojny [Sun, 6 Jan 2013 13:10:07 +0000 (14:10 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

12 years agoCoding style, ANSI C compatibility
commit | commitdiff | tree
Lars Strojny [Sun, 6 Jan 2013 13:08:23 +0000 (14:08 +0100)]
Coding style, ANSI C compatibility

12 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Xinchen Hui [Sun, 6 Jan 2013 02:25:04 +0000 (10:25 +0800)]
Merge branch 'PHP-5.5'

12 years agoMerge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
commit | commitdiff | tree
Xinchen Hui [Sun, 6 Jan 2013 02:23:51 +0000 (10:23 +0800)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

12 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Lars Strojny [Sun, 6 Jan 2013 02:23:36 +0000 (03:23 +0100)]
Merge branch 'PHP-5.5'

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Xinchen Hui [Sun, 6 Jan 2013 02:23:21 +0000 (10:23 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5

12 years agoBug #23955: allow specifiy max age for setcookie()
commit | commitdiff | tree
Lars Strojny [Sun, 6 Jan 2013 02:22:44 +0000 (03:22 +0100)]
Bug #23955: allow specifiy max age for setcookie()

12 years agobump year
commit | commitdiff | tree
Xinchen Hui [Sun, 6 Jan 2013 02:22:15 +0000 (10:22 +0800)]
bump year

12 years agoMerge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
commit | commitdiff | tree
Xinchen Hui [Sun, 6 Jan 2013 02:20:10 +0000 (10:20 +0800)]
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
commit | commitdiff | tree
Xinchen Hui [Sun, 6 Jan 2013 02:20:00 +0000 (10:20 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4

12 years agobump year
commit | commitdiff | tree
Xinchen Hui [Sun, 6 Jan 2013 02:19:09 +0000 (10:19 +0800)]
bump year

12 years agoAdding test from 5.5
commit | commitdiff | tree
Lars Strojny [Sun, 6 Jan 2013 02:15:08 +0000 (03:15 +0100)]
Adding test from 5.5

12 years agoBug #63699: performance improvements for varios ext/date functions
commit | commitdiff | tree
Lars Strojny [Sun, 6 Jan 2013 02:06:09 +0000 (03:06 +0100)]
Bug #63699: performance improvements for varios ext/date functions

12 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Lars Strojny [Sun, 6 Jan 2013 01:11:34 +0000 (02:11 +0100)]
Merge branch 'PHP-5.5'

12 years agoBug #63699 performance improvements for ext/date by only validating timezone when...
commit | commitdiff | tree
Lars Strojny [Sun, 6 Jan 2013 01:10:16 +0000 (02:10 +0100)]
Bug #63699 performance improvements for ext/date by only validating timezone when timezone is set

12 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Pierrick Charron [Sat, 5 Jan 2013 16:12:00 +0000 (11:12 -0500)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Improve resource management for curl handle

12 years agoImprove resource management for curl handle
commit | commitdiff | tree
Pierrick Charron [Sat, 5 Jan 2013 16:07:59 +0000 (11:07 -0500)]
Improve resource management for curl handle

Previous implementation was using its own refcounting (uses field of
the php_curl struct). zend_list_add/remove already implements its own
refcount, so we don't need to use an other one.

12 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Xinchen Hui [Fri, 4 Jan 2013 03:06:26 +0000 (11:06 +0800)]
Merge branch 'PHP-5.5'

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Xinchen Hui [Fri, 4 Jan 2013 03:05:53 +0000 (11:05 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5

12 years agoUpdate NEWS
commit | commitdiff | tree
Xinchen Hui [Fri, 4 Jan 2013 03:05:24 +0000 (11:05 +0800)]
Update NEWS

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
commit | commitdiff | tree
Xinchen Hui [Fri, 4 Jan 2013 03:03:52 +0000 (11:03 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4

12 years agoFixed bug #63899 (Use after scope error in zend_compile)
commit | commitdiff | tree
Xinchen Hui [Fri, 4 Jan 2013 03:02:21 +0000 (11:02 +0800)]
Fixed bug #63899 (Use after scope error in zend_compile)

12 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Stanislav Malyshev [Fri, 4 Jan 2013 01:34:21 +0000 (17:34 -0800)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  5.4.12-dev

12 years agoMerge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
commit | commitdiff | tree
Stanislav Malyshev [Fri, 4 Jan 2013 01:33:13 +0000 (17:33 -0800)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

* 'PHP-5.5' of git.php.net:php-src:
  remove set but not used variables

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Stanislav Malyshev [Fri, 4 Jan 2013 01:27:19 +0000 (17:27 -0800)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  5.4.12-dev
  This will be PHP 5.3.22

Conflicts:
configure.in
main/php_version.h

12 years ago5.4.12-dev
commit | commitdiff | tree
Stanislav Malyshev [Fri, 4 Jan 2013 01:25:23 +0000 (17:25 -0800)]
5.4.12-dev

12 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Johannes Schlüter [Thu, 3 Jan 2013 22:00:30 +0000 (23:00 +0100)]
Merge branch 'PHP-5.5'

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Johannes Schlüter [Thu, 3 Jan 2013 22:00:17 +0000 (23:00 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
commit | commitdiff | tree
Johannes Schlüter [Thu, 3 Jan 2013 21:59:38 +0000 (22:59 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4

Conflicts:
configure.in
main/php_version.h

12 years agoThis will be PHP 5.3.22
commit | commitdiff | tree
Johannes Schlüter [Thu, 3 Jan 2013 21:56:46 +0000 (22:56 +0100)]
This will be PHP 5.3.22

12 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Remi Collet [Wed, 2 Jan 2013 15:57:44 +0000 (16:57 +0100)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  remove set but not used variables

12 years agoremove set but not used variables
commit | commitdiff | tree
Remi Collet [Wed, 2 Jan 2013 15:48:46 +0000 (16:48 +0100)]
remove set but not used variables

12 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Stanislav Malyshev [Wed, 2 Jan 2013 06:10:22 +0000 (22:10 -0800)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  add bug #63762

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Stanislav Malyshev [Wed, 2 Jan 2013 06:10:10 +0000 (22:10 -0800)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  add bug #63762

12 years agoadd bug #63762
commit | commitdiff | tree
Stanislav Malyshev [Wed, 2 Jan 2013 06:09:32 +0000 (22:09 -0800)]
add bug #63762

12 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Stanislav Malyshev [Wed, 2 Jan 2013 05:24:43 +0000 (21:24 -0800)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  add fix #43177

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Stanislav Malyshev [Wed, 2 Jan 2013 05:24:37 +0000 (21:24 -0800)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  add fix #43177

12 years agoadd fix #43177
commit | commitdiff | tree
Stanislav Malyshev [Wed, 2 Jan 2013 05:24:11 +0000 (21:24 -0800)]
add fix #43177

12 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Stanislav Malyshev [Wed, 2 Jan 2013 05:21:42 +0000 (21:21 -0800)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Bug #43177: If an eval() has a parse error, the overall exit status and return code should not be affected.
  fix NEWS

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Stanislav Malyshev [Wed, 2 Jan 2013 05:20:35 +0000 (21:20 -0800)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Bug #43177: If an eval() has a parse error, the overall exit status and return code should not be affected.
  fix NEWS

Conflicts:
main/main.c

12 years agoBug #43177: If an eval() has a parse error, the overall exit status and return code...
commit | commitdiff | tree
Stanislav Malyshev [Wed, 2 Jan 2013 04:14:44 +0000 (20:14 -0800)]
Bug #43177: If an eval() has a parse error, the overall exit status and return code should not be affected.

Without this fix, a webpage using eval() may return code 500.  That might display
fine and the 500 go unnoticed, but using AJAX or wget, the 500 will cause problems.

12 years agofix NEWS
commit | commitdiff | tree
Stanislav Malyshev [Mon, 31 Dec 2012 01:58:40 +0000 (17:58 -0800)]
fix NEWS

12 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Pierrick Charron [Wed, 2 Jan 2013 02:18:08 +0000 (21:18 -0500)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Remove passwd handler from struct when not needed

12 years agoRemove passwd handler from struct when not needed
commit | commitdiff | tree
Pierrick Charron [Wed, 2 Jan 2013 02:12:02 +0000 (21:12 -0500)]
Remove passwd handler from struct when not needed

CURLOPT_PASSWDFUNCTION was removed in cURL 7.15.5, the passwd field
will not be used for version greater than this one

12 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Xinchen Hui [Tue, 1 Jan 2013 08:39:03 +0000 (16:39 +0800)]
Merge branch 'PHP-5.5'

12 years agoHappy New Year
commit | commitdiff | tree
Xinchen Hui [Tue, 1 Jan 2013 08:37:09 +0000 (16:37 +0800)]
Happy New Year

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Xinchen Hui [Tue, 1 Jan 2013 08:31:06 +0000 (16:31 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5

12 years agoHappy New Year
commit | commitdiff | tree
Xinchen Hui [Tue, 1 Jan 2013 08:28:54 +0000 (16:28 +0800)]
Happy New Year

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
commit | commitdiff | tree
Xinchen Hui [Tue, 1 Jan 2013 08:25:09 +0000 (16:25 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4

12 years agoHappy New Year
commit | commitdiff | tree
Xinchen Hui [Tue, 1 Jan 2013 08:23:31 +0000 (16:23 +0800)]
Happy New Year

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
commit | commitdiff | tree
Xinchen Hui [Tue, 1 Jan 2013 08:07:55 +0000 (16:07 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4

12 years agoHappy New Year~
commit | commitdiff | tree
Xinchen Hui [Tue, 1 Jan 2013 08:02:16 +0000 (16:02 +0800)]
Happy New Year~

12 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Pierrick Charron [Sun, 30 Dec 2012 04:16:53 +0000 (23:16 -0500)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed bug #63874 (Segfaul if php_strip_whitespace has heredoc)

12 years agoFixed bug #63874 (Segfaul if php_strip_whitespace has heredoc)
commit | commitdiff | tree
Pierrick Charron [Sun, 30 Dec 2012 04:11:37 +0000 (23:11 -0500)]
Fixed bug #63874 (Segfaul if php_strip_whitespace has heredoc)

T_END_HEREDOC don't carry a token value anymore since commit 4cf90e06c
Bugfix by Nikita for bug #60097

12 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Lars Strojny [Sat, 29 Dec 2012 02:38:23 +0000 (03:38 +0100)]
Merge branch 'PHP-5.5'

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