]> granicus.if.org Git - php/log
php
11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Felipe Pena [Wed, 3 Jul 2013 18:02:39 +0000 (15:02 -0300)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  - Fixed build on FreeTDS 0.82

11 years ago- Fixed build on FreeTDS 0.82
Felipe Pena [Wed, 3 Jul 2013 18:02:03 +0000 (15:02 -0300)]
- Fixed build on FreeTDS 0.82

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Johannes Schlüter [Wed, 3 Jul 2013 15:10:58 +0000 (17:10 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

11 years agoMake sure return value is initialised in case transaction startup fails
Johannes Schlüter [Wed, 3 Jul 2013 15:08:14 +0000 (17:08 +0200)]
Make sure return value is initialised in case transaction startup fails

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Johannes Schlüter [Wed, 3 Jul 2013 14:58:20 +0000 (16:58 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
Zend/acinclude.m4

11 years agoMake sure result is initilized
Johannes Schlüter [Wed, 3 Jul 2013 14:53:09 +0000 (16:53 +0200)]
Make sure result is initilized

Practically this could only be an issue when overriding mysqlnd from
an extension, but makes static analysis happy

11 years agoFixed bug #65184 strftime() returns insufficient-length
Anatol Belski [Wed, 3 Jul 2013 09:12:46 +0000 (11:12 +0200)]
Fixed bug #65184 strftime() returns insufficient-length

string under multibyte locales

The msdn doc states 'strftime returns the number of characters', but prior
to VS2012 it seems to have returned the number of bytes. Locale independent.
The return is however \0-terminated, so strlen is just fine. The behaivor
seems to be persisting in the later VC++ versions as the corresponding
MSDN ticket is closed 'by design'.

See http://connect.microsoft.com/VisualStudio/feedback/details/766205/vs2012-strftime-has-incorrect-return-value-in-vc-11-with-multibyte-codepages#details

11 years agoMerge branch 'PHP-5.3' into PHP-5.4
Sebastian Bergmann [Wed, 3 Jul 2013 04:37:04 +0000 (06:37 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

11 years agoAdd bison 2.6.4 to the list of supported versions
Sebastian Bergmann [Wed, 3 Jul 2013 04:36:54 +0000 (06:36 +0200)]
Add bison 2.6.4 to the list of supported versions

11 years agoNEWS for two lst intl changes
Gustavo André dos Santos Lopes [Wed, 3 Jul 2013 04:22:33 +0000 (05:22 +0100)]
NEWS for two lst intl changes

11 years agointl: fix extra space in constant name
Gustavo André dos Santos Lopes [Wed, 3 Jul 2013 04:02:20 +0000 (05:02 +0100)]
intl: fix extra space in constant name

11 years agointl: add intlcal_set_minimal_days_in_first_week()
Gustavo André dos Santos Lopes [Wed, 3 Jul 2013 03:57:23 +0000 (04:57 +0100)]
intl: add intlcal_set_minimal_days_in_first_week()

and IntlCalendar::setMinimalDaysInFirstWeek(). This one had slipped.
we had a ::getMinimalDaysInFirstWeek() but no way to change the value.

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Remi Collet [Tue, 2 Jul 2013 10:19:37 +0000 (12:19 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix typo in php man page

11 years agofix typo in php man page
Remi Collet [Tue, 2 Jul 2013 10:19:09 +0000 (12:19 +0200)]
fix typo in php man page

11 years agoNEWS
Remi Collet [Tue, 2 Jul 2013 08:48:19 +0000 (10:48 +0200)]
NEWS

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Remi Collet [Tue, 2 Jul 2013 08:47:38 +0000 (10:47 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed Bug #65142 Missing phar man page
  NEWS
  Fixed Bug #65143 Missing php-cgi man page

11 years agoFixed Bug #65142 Missing phar man page
Remi Collet [Tue, 2 Jul 2013 08:46:50 +0000 (10:46 +0200)]
Fixed Bug #65142 Missing phar man page

Simple man page from phar help output.

11 years agoNEWS
Remi Collet [Tue, 2 Jul 2013 08:46:21 +0000 (10:46 +0200)]
NEWS

11 years agoFixed Bug #65143 Missing php-cgi man page
Remi Collet [Tue, 2 Jul 2013 08:42:47 +0000 (10:42 +0200)]
Fixed Bug #65143 Missing php-cgi man page

Currently php-cgi man page is a simple redirect to
php (CLI) man page.

Could be splited / improved in the future.

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Anatol Belski [Tue, 2 Jul 2013 06:24:37 +0000 (08:24 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed mysql tests parsing phpinfo()
  Update NEWS
  Fixed bug #35703: when session_name("123") consist only digits, should warning
  Fixed bug #49175: mod_files.sh does not support hash bits

11 years agoFixed mysql tests parsing phpinfo()
Anatol Belski [Tue, 2 Jul 2013 06:23:33 +0000 (08:23 +0200)]
Fixed mysql tests parsing phpinfo()

11 years agoAdd a few links
Christopher Jones [Mon, 1 Jul 2013 23:48:18 +0000 (16:48 -0700)]
Add a few links

11 years agoMerge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
Christopher Jones [Mon, 1 Jul 2013 20:45:44 +0000 (13:45 -0700)]
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5

# By Stanislav Malyshev (3) and others
# Via Stanislav Malyshev (3) and Nikita Popov (1)
* 'PHP-5.5' of https://git.php.net/repository/php-src:
  Don't try to clean up generator stack on unclean shutdown
  NEWS
  Added PHP_FCGI_BACKLOG, overrides the default listen backlog
  Fixed bug #49175: mod_files.sh does not support hash bits
  add fix for  #60560 into upgrading
  Add a __wakeup() method to SplFixedArray, thereby fixing serialising an
  Update NEWS
  small optimization
  fix bug #61860: use USearch for searches, it does the right thing

11 years agoMerge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
Christopher Jones [Mon, 1 Jul 2013 20:45:41 +0000 (13:45 -0700)]
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4

# By Stanislav Malyshev (3) and others
# Via Stanislav Malyshev (1) and Yasuo Ohgaki (1)
* 'PHP-5.4' of https://git.php.net/repository/php-src:
  Update NEWS
  Fixed bug #35703: when session_name("123") consist only digits, should warning
  Fixed bug #49175: mod_files.sh does not support hash bits
  add fix for  #60560 into upgrading
  Add a __wakeup() method to SplFixedArray, thereby fixing serialising an
  small optimization
  fix bug #61860: use USearch for searches, it does the right thing

11 years agoDon't try to clean up generator stack on unclean shutdown
Nikita Popov [Sat, 29 Jun 2013 19:51:54 +0000 (21:51 +0200)]
Don't try to clean up generator stack on unclean shutdown

This fixes bugs #65035 and #65161. In one of the bugs the issue is
that function_state.arguments is NULL, but the arg count is pushed
to the stack and the code tries to free it. In the other bug the
stack of the generator is freed twice, once in generator_close and
later during shutdown.

It's rather hard (if at all possible) to do a proper stack cleanup
on an unclean shutdown, so I'm just disabling it in this case.

11 years agoNEWS
Arnaud Le Blanc [Sat, 29 Jun 2013 15:54:55 +0000 (17:54 +0200)]
NEWS

11 years agoAdded PHP_FCGI_BACKLOG, overrides the default listen backlog
Arnaud Le Blanc [Sun, 28 Apr 2013 14:25:30 +0000 (16:25 +0200)]
Added PHP_FCGI_BACKLOG, overrides the default listen backlog

11 years agoUpdate NEWS
Yasuo Ohgaki [Sat, 29 Jun 2013 02:35:27 +0000 (11:35 +0900)]
Update NEWS

11 years agoFixed bug #35703: when session_name("123") consist only digits, should warning
Yasuo Ohgaki [Fri, 28 Jun 2013 23:07:44 +0000 (08:07 +0900)]
Fixed bug #35703: when session_name("123") consist only digits, should warning

11 years agoFixed bug #49175: mod_files.sh does not support hash bits
Yasuo Ohgaki [Fri, 28 Jun 2013 21:45:18 +0000 (06:45 +0900)]
Fixed bug #49175: mod_files.sh does not support hash bits

11 years agoFixed bug #49175: mod_files.sh does not support hash bits
Yasuo Ohgaki [Fri, 28 Jun 2013 21:45:18 +0000 (06:45 +0900)]
Fixed bug #49175: mod_files.sh does not support hash bits

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Fri, 28 Jun 2013 21:01:53 +0000 (14:01 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  add fix for  #60560 into upgrading

11 years agoadd fix for #60560 into upgrading
Stanislav Malyshev [Fri, 28 Jun 2013 21:01:25 +0000 (14:01 -0700)]
add fix for  #60560 into upgrading

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Fri, 28 Jun 2013 20:55:26 +0000 (13:55 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Add a __wakeup() method to SplFixedArray, thereby fixing serialising an
  Update NEWS
  small optimization
  fix bug #61860: use USearch for searches, it does the right thing

11 years agoMerge branch 'bug61860' into PHP-5.4
Stanislav Malyshev [Fri, 28 Jun 2013 20:53:13 +0000 (13:53 -0700)]
Merge branch 'bug61860' into PHP-5.4

* bug61860:
  small optimization
  fix bug #61860: use USearch for searches, it does the right thing

11 years agoAdd a __wakeup() method to SplFixedArray, thereby fixing serialising an
Adam Harvey [Tue, 21 Feb 2012 10:34:42 +0000 (10:34 +0000)]
Add a __wakeup() method to SplFixedArray, thereby fixing serialising an

SplFixedArray object and bug #60560 (SplFixedArray un-/serialize, getSize(),
count() return 0, keys are strings).

11 years agoMerge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
Christopher Jones [Thu, 27 Jun 2013 23:48:26 +0000 (16:48 -0700)]
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5

# By Felipe Pena (11) and others
# Via Felipe Pena (7) and others
* 'PHP-5.5' of https://git.php.net/repository/php-src: (22 commits)
  Fix bug #62535 - $_SESSION[$key]["cancel_upload"] doesn't work as documented
  Update NEWS
  BC fix for PR 109 merge - create_sid() method in SessionHandler
  Update NEWS:w
  Fixed bug #65136 (RecursiveDirectoryIterator segfault)
  - BFN
  - Fixed bug #64467 (Segmentation fault after imap_reopen failure) patch by: askalski at gmail dot com
  - Reclassify bug
  - BFN
  - Fixed bug #63983 (enabling FPM borks compile on FreeBSD) patch by: chibisuke at web dot de
  - Fixed bug #63409 (php-dba function test fails on big-endian machine) patch by: tianhonglouis at gmail dot com
  - Fixed test
  add new test
  Update NEWS
  Fixed bug #65015 (pg_send_query does not flush send buffer) patch submitted by: adam at vektah dot net
  - Fixed typo on condition
  - BFN
  - Fixed bug #62475 (variant_* functions causes crash when null given as an argument)
  Update NEWS
  - BFN
  ...

11 years agoMerge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
Christopher Jones [Thu, 27 Jun 2013 23:48:25 +0000 (16:48 -0700)]
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4

# By Felipe Pena (9) and others
# Via Arpad Ray (1) and Felipe Pena (1)
* 'PHP-5.4' of https://git.php.net/repository/php-src:
  Update NEWS
  Fix bug #62535 - $_SESSION[$key]["cancel_upload"] doesn't work as documented
  Fixed bug #65136 (RecursiveDirectoryIterator segfault)
  - BFN
  - Fixed bug #64467 (Segmentation fault after imap_reopen failure) patch by: askalski at gmail dot com
  - Reclassify bug
  - BFN
  - Fixed bug #63983 (enabling FPM borks compile on FreeBSD) patch by: chibisuke at web dot de
  - Fixed bug #63409 (php-dba function test fails on big-endian machine) patch by: tianhonglouis at gmail dot com
  - Fixed test
  add new test
  Update NEWS
  Fixed bug #65015 (pg_send_query does not flush send buffer) patch submitted by: adam at vektah dot net
  - BFN
  - Fixed bug #62475 (variant_* functions causes crash when null given as an argument)

11 years agoUpdate NEWS
Arpad Ray [Thu, 27 Jun 2013 18:23:58 +0000 (19:23 +0100)]
Update NEWS

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Arpad Ray [Thu, 27 Jun 2013 18:12:46 +0000 (19:12 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix bug #62535 - $_SESSION[$key]["cancel_upload"] doesn't work as documented

11 years agoFix bug #62535 - $_SESSION[$key]["cancel_upload"] doesn't work as documented
Arpad Ray [Thu, 27 Jun 2013 18:05:23 +0000 (19:05 +0100)]
Fix bug #62535 - $_SESSION[$key]["cancel_upload"] doesn't work as documented

When uploading multiple files, the array in the session where the progress
data is stored (and cancel_upload key is set) was overwritten whenever the
progress data was updated, so pending uploads would proceed anyway.

11 years agoUpdate NEWS
Arpad Ray [Thu, 27 Jun 2013 11:49:16 +0000 (12:49 +0100)]
Update NEWS

11 years agoBC fix for PR 109 merge - create_sid() method in SessionHandler
Arpad Ray [Thu, 27 Jun 2013 11:33:56 +0000 (12:33 +0100)]
BC fix for PR 109 merge - create_sid() method in SessionHandler

Creates a new SessionIdInterface and moves create_sid() into it, so existing
handlers implementing SessionHandlerInterface don't require create_sid().
SessionHandler still includes the method so the default mod can be called, but
now implements both interfaces.

Also added several more tests for this feature.

11 years agoMerge PR 109 - Add create_sid to session_set_save_handler and SessionHandler
Arpad Ray [Thu, 27 Jun 2013 10:27:49 +0000 (11:27 +0100)]
Merge PR 109 - Add create_sid to session_set_save_handler and SessionHandler

Allows user session handlers to create session IDs by adding an optional
7th argument to session_set_save_handler() and a create_sid() method
to SessionHandler.

11 years agoUpdate NEWS:w
Xinchen Hui [Thu, 27 Jun 2013 04:38:35 +0000 (12:38 +0800)]
Update NEWS:w

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Xinchen Hui [Thu, 27 Jun 2013 04:38:13 +0000 (12:38 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5

11 years agoFixed bug #65136 (RecursiveDirectoryIterator segfault)
Xinchen Hui [Thu, 27 Jun 2013 04:37:57 +0000 (12:37 +0800)]
Fixed bug #65136 (RecursiveDirectoryIterator segfault)

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Felipe Pena [Wed, 26 Jun 2013 22:16:26 +0000 (19:16 -0300)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  - BFN
  - Fixed bug #64467 (Segmentation fault after imap_reopen failure) patch by: askalski at gmail dot com
  - Reclassify bug

11 years ago- BFN
Felipe Pena [Wed, 26 Jun 2013 22:16:13 +0000 (19:16 -0300)]
- BFN

11 years ago- Fixed bug #64467 (Segmentation fault after imap_reopen failure) patch by: askalski...
Felipe Pena [Wed, 26 Jun 2013 22:15:19 +0000 (19:15 -0300)]
- Fixed bug #64467 (Segmentation fault after imap_reopen failure) patch by: askalski at gmail dot com

11 years ago- Reclassify bug
Felipe Pena [Wed, 26 Jun 2013 18:15:37 +0000 (15:15 -0300)]
- Reclassify bug

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Felipe Pena [Wed, 26 Jun 2013 18:08:51 +0000 (15:08 -0300)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  - BFN
  - Fixed bug #63983 (enabling FPM borks compile on FreeBSD) patch by: chibisuke at web dot de

11 years ago- BFN
Felipe Pena [Wed, 26 Jun 2013 18:08:33 +0000 (15:08 -0300)]
- BFN

11 years ago- Fixed bug #63983 (enabling FPM borks compile on FreeBSD) patch by: chibisuke at...
Felipe Pena [Wed, 26 Jun 2013 18:06:27 +0000 (15:06 -0300)]
- Fixed bug #63983 (enabling FPM borks compile on FreeBSD) patch by: chibisuke at web dot de

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Felipe Pena [Wed, 26 Jun 2013 16:50:43 +0000 (13:50 -0300)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  - Fixed bug #63409 (php-dba function test fails on big-endian machine) patch by: tianhonglouis at gmail dot com

11 years ago- Fixed bug #63409 (php-dba function test fails on big-endian machine) patch by:...
Felipe Pena [Wed, 26 Jun 2013 16:50:37 +0000 (13:50 -0300)]
- Fixed bug #63409 (php-dba function test fails on big-endian machine) patch by: tianhonglouis at gmail dot com

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Felipe Pena [Wed, 26 Jun 2013 16:36:41 +0000 (13:36 -0300)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  - Fixed test

11 years ago- Fixed test
Felipe Pena [Wed, 26 Jun 2013 16:36:36 +0000 (13:36 -0300)]
- Fixed test

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Andrey Hristov [Wed, 26 Jun 2013 14:50:08 +0000 (16:50 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
NEWS

11 years agoadd new test
Andrey Hristov [Wed, 26 Jun 2013 14:44:26 +0000 (16:44 +0200)]
add new test

11 years agoUpdate NEWS
Yasuo Ohgaki [Wed, 26 Jun 2013 07:31:34 +0000 (16:31 +0900)]
Update NEWS

11 years agoFixed bug #65015 (pg_send_query does not flush send buffer) patch submitted by: adam...
Yasuo Ohgaki [Wed, 26 Jun 2013 07:17:57 +0000 (16:17 +0900)]
Fixed bug #65015 (pg_send_query does not flush send buffer) patch submitted by: adam at vektah dot net

11 years ago- Fixed typo on condition
Felipe Pena [Wed, 26 Jun 2013 00:53:20 +0000 (21:53 -0300)]
- Fixed typo on condition

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Felipe Pena [Wed, 26 Jun 2013 00:44:03 +0000 (21:44 -0300)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  - BFN

11 years ago- BFN
Felipe Pena [Wed, 26 Jun 2013 00:43:23 +0000 (21:43 -0300)]
- BFN

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Felipe Pena [Wed, 26 Jun 2013 00:40:24 +0000 (21:40 -0300)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  - Fixed bug #62475 (variant_* functions causes crash when null given as an argument)
  Update NEWS
  - BFN

11 years agoMerge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4
Felipe Pena [Wed, 26 Jun 2013 00:39:17 +0000 (21:39 -0300)]
Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4

11 years ago- Fixed bug #62475 (variant_* functions causes crash when null given as an argument)
Felipe Pena [Wed, 26 Jun 2013 00:36:50 +0000 (21:36 -0300)]
- Fixed bug #62475 (variant_* functions causes crash when null given as an argument)

11 years agoUpdate NEWS
Christopher Jones [Wed, 26 Jun 2013 00:31:13 +0000 (17:31 -0700)]
Update NEWS

11 years agoUpdate NEWS
Christopher Jones [Wed, 26 Jun 2013 00:30:21 +0000 (17:30 -0700)]
Update NEWS

11 years agoMerge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
Christopher Jones [Wed, 26 Jun 2013 00:28:12 +0000 (17:28 -0700)]
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5

# By Felipe Pena
# Via Felipe Pena
* 'PHP-5.5' of https://git.php.net/repository/php-src:
  - Fixed bug #62672 (Error on serialize of ArrayObject) patch by: lior dot k at zend dot com
  - BFN
  - Fixed bug #62964 (Possible XSS on "Registered stream filters" info) patch by: david at nnucomputerwhiz dot com

11 years agoMerge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
Christopher Jones [Wed, 26 Jun 2013 00:28:11 +0000 (17:28 -0700)]
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4

# By Felipe Pena
# Via Felipe Pena
* 'PHP-5.4' of https://git.php.net/repository/php-src:
  - BFN
  - Fixed bug #62672 (Error on serialize of ArrayObject) patch by: lior dot k at zend dot com
  - BFN
  - Fixed bug #62964 (Possible XSS on "Registered stream filters" info) patch by: david at nnucomputerwhiz dot com

11 years ago- BFN
Felipe Pena [Wed, 26 Jun 2013 00:19:56 +0000 (21:19 -0300)]
- BFN

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Felipe Pena [Wed, 26 Jun 2013 00:18:34 +0000 (21:18 -0300)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  - Fixed bug #62672 (Error on serialize of ArrayObject) patch by: lior dot k at zend dot com
  - BFN

11 years ago- Fixed bug #62672 (Error on serialize of ArrayObject) patch by: lior dot k at zend...
Felipe Pena [Wed, 26 Jun 2013 00:18:09 +0000 (21:18 -0300)]
- Fixed bug #62672 (Error on serialize of ArrayObject) patch by: lior dot k at zend dot com

11 years ago- BFN
Felipe Pena [Tue, 25 Jun 2013 21:04:25 +0000 (18:04 -0300)]
- BFN

11 years agoMerge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4
Felipe Pena [Tue, 25 Jun 2013 21:01:46 +0000 (18:01 -0300)]
Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4

11 years agoMerge branch 'PHP-5.5' of git.php.net:/php-src into PHP-5.5
Felipe Pena [Tue, 25 Jun 2013 21:01:40 +0000 (18:01 -0300)]
Merge branch 'PHP-5.5' of git.php.net:/php-src into PHP-5.5

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Felipe Pena [Tue, 25 Jun 2013 21:00:42 +0000 (18:00 -0300)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  - Fixed bug #62964 (Possible XSS on "Registered stream filters" info) patch by: david at nnucomputerwhiz dot com
  - BFN

11 years ago- Fixed bug #62964 (Possible XSS on "Registered stream filters" info) patch by: david...
Felipe Pena [Tue, 25 Jun 2013 21:00:33 +0000 (18:00 -0300)]
- Fixed bug #62964 (Possible XSS on "Registered stream filters" info) patch by: david at nnucomputerwhiz dot com

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Christopher Jones [Tue, 25 Jun 2013 20:25:04 +0000 (13:25 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  - BFN

11 years agoMerge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
Christopher Jones [Tue, 25 Jun 2013 20:23:50 +0000 (13:23 -0700)]
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 bug #60732 (php_error_docref links to invalid pages) patch by: Jakub Vrana

11 years agoMerge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
Christopher Jones [Tue, 25 Jun 2013 20:23:25 +0000 (13:23 -0700)]
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:
  - BFN
  - Fixed bug #60732 (php_error_docref links to invalid pages) patch by: Jakub Vrana

11 years ago- BFN
Felipe Pena [Tue, 25 Jun 2013 19:27:30 +0000 (16:27 -0300)]
- BFN

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Felipe Pena [Tue, 25 Jun 2013 19:26:36 +0000 (16:26 -0300)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  - Fixed bug #60732 (php_error_docref links to invalid pages) patch by: Jakub Vrana

11 years ago- Fixed bug #60732 (php_error_docref links to invalid pages) patch by: Jakub Vrana
Felipe Pena [Tue, 25 Jun 2013 19:26:26 +0000 (16:26 -0300)]
- Fixed bug #60732 (php_error_docref links to invalid pages) patch by: Jakub Vrana

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Christopher Jones [Tue, 25 Jun 2013 19:00:24 +0000 (12:00 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Minium changes to allow PDO_OCI to build with Oracle Database 12c libraries. (note OCI8 already builds with Oracle Database 12c)

11 years agoMerge branch 'configure12c' into PHP-5.4
Christopher Jones [Tue, 25 Jun 2013 19:00:08 +0000 (12:00 -0700)]
Merge branch 'configure12c' into PHP-5.4

* configure12c:
  Minium changes to allow PDO_OCI to build with Oracle Database 12c libraries. (note OCI8 already builds with Oracle Database 12c)

11 years agoMinium changes to allow PDO_OCI to build with Oracle Database 12c libraries.
Christopher Jones [Tue, 25 Jun 2013 18:55:41 +0000 (11:55 -0700)]
Minium changes to allow PDO_OCI to build with Oracle Database 12c libraries.
(note OCI8 already builds with Oracle Database 12c)

11 years agoFixed bug #64827 Segfault in zval_mark_grey (zend_gc.c)
Xinchen Hui [Tue, 25 Jun 2013 05:47:50 +0000 (13:47 +0800)]
Fixed bug #64827 Segfault in zval_mark_grey (zend_gc.c)

I can not get a reproduce script since the context is very strict.

Of course I will try to make one, but for now, I just commit this first.

11 years agoUpdate NEWS
Xinchen Hui [Tue, 25 Jun 2013 05:39:31 +0000 (13:39 +0800)]
Update NEWS

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Xinchen Hui [Tue, 25 Jun 2013 05:38:50 +0000 (13:38 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5

11 years agoFixed Bug #61828 (Memleak when calling Directory(Recursive)Iterator/Spl(Temp)FileObje...
Xinchen Hui [Tue, 25 Jun 2013 05:37:56 +0000 (13:37 +0800)]
Fixed Bug #61828 (Memleak when calling Directory(Recursive)Iterator/Spl(Temp)FileObject ctor twice)

11 years agoSome tidy-ups: Don't mention Logo GUIDs in three places; mention
Christopher Jones [Tue, 25 Jun 2013 00:12:35 +0000 (17:12 -0700)]
Some tidy-ups: Don't mention Logo GUIDs in three places; mention
password_hash functionality; add some doc URLs for new features;
grammar & typos; formatting changes.

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Felipe Pena [Mon, 24 Jun 2013 19:49:22 +0000 (16:49 -0300)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  - Fixed bug #61594 (ext/session/mod_mm.c: missing free of ps_mm_instance) patch by: jlawall at hotmail dot com
  - BFN

11 years ago- Fixed bug #61594 (ext/session/mod_mm.c: missing free of ps_mm_instance) patch by...
Felipe Pena [Mon, 24 Jun 2013 19:49:15 +0000 (16:49 -0300)]
- Fixed bug #61594 (ext/session/mod_mm.c: missing free of ps_mm_instance) patch by: jlawall at hotmail dot com

11 years ago- BFN
Felipe Pena [Mon, 24 Jun 2013 17:50:14 +0000 (14:50 -0300)]
- BFN

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Felipe Pena [Mon, 24 Jun 2013 17:47:40 +0000 (14:47 -0300)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  - Fixed bug #61387 (NULL valued anonymous column causes segfault in odbc_fetch_array) patch by: Brandon Kirsch

11 years ago- Fixed bug #61387 (NULL valued anonymous column causes segfault in odbc_fetch_array...
Felipe Pena [Mon, 24 Jun 2013 17:43:35 +0000 (14:43 -0300)]
- Fixed bug #61387 (NULL valued anonymous column causes segfault in odbc_fetch_array) patch by: Brandon Kirsch

11 years agoMerge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Xinchen Hui [Mon, 24 Jun 2013 15:49:45 +0000 (23:49 +0800)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5