Commit Graph

71771 Commits

Author SHA1 Message Date
andrey
6074df91c6 remove old unicode code, that is was compiled out by using a macro 2012-09-25 16:36:21 +02:00
andrey
571b46bff6 Add SHA256 authentication support - password hashing to mysqlnd
Automatic switchover to SSL with plain-text password is not part of this
2012-09-25 14:04:36 +02:00
Xinchen Hui
8a930c93dd Merge branch 'PHP-5.4' 2012-09-24 19:47:47 +08:00
Xinchen Hui
8cdd6bc1e7 Merge branch 'PHP-5.3' into PHP-5.4 2012-09-24 19:47:28 +08:00
Xinchen Hui
2cbc4053ae Correct the test summary 2012-09-24 19:46:40 +08:00
Xinchen Hui
518fa8c4cf Merge branch 'PHP-5.4' 2012-09-24 11:01:24 +08:00
Xinchen Hui
d9ad532050 Merge branch 'PHP-5.3' into PHP-5.4
Conflicts:
	ext/standard/tests/general_functions/bug60723.phpt
2012-09-24 11:00:58 +08:00
Xinchen Hui
923511d364 Fixed bug #60723 (error_log error time has changed to UTC ignoring default timezo)
Cherry pick to 5.3
2012-09-24 10:59:06 +08:00
Xinchen Hui
8fcb4f1107 Merge branch 'PHP-5.4' 2012-09-23 23:00:15 +08:00
Xinchen Hui
395d77c540 Fixed bug #60723 (error_log error time has changed to UTC ignoring default timezo) 2012-09-23 22:59:31 +08:00
Nikita Popov
5de79f9f07 Add NEWS/UPGRADING for previous change 2012-09-22 21:54:59 +02:00
Nikita Popov
5c7dd7811e Simplify set_error_handler/set_exception_handler code 2012-09-22 21:46:29 +02:00
Nikita Popov
f28c128b20 Return previous error handler when resetting the error handler
set_error_handler(null) and set_exception_handler(null) now return the
previous error/exception handler instead of just returning bool(true).
This is consistent with the behavior of these functions with non-null
values.
2012-09-22 21:46:18 +02:00
Nikita Popov
c815dd74bc Allow resetting the error handler
This allows the error handler to be reset using set_error_handler(null).
As the code suggests this behavior was already previously intended, but
the callback check was done too strictly.
2012-09-22 21:46:02 +02:00
Nikita Popov
4954aba2ed Revert error/exception handler changes
This reverts the following two commits:

 * 6ba2e662e4
 * d8f8e98d8e

Laruence already did some partial changes to set_error_handler and
set_exception_handler. I'm reverting those modifications to apply the full
set of changes. (The modifications changed the code structure in a way that
would lead to more duplication with the new behavior.)
2012-09-22 21:41:51 +02:00
Nikita Popov
a31fa55b44 Fixed bug #63132
EG(arg_types_stack) is now also backed up when generators are used. This
allows the use of yield in nested method calls.

This commit adds two new functions to the zend_ptr_stack API:

    zend_ptr_stack_push_from_memory
    zend_ptr_stack_pop_into_memory

both taking the following arguments:

    zend_ptr_stack *stack, int count, void **pointers
2012-09-22 19:15:53 +02:00
Pierrick Charron
6c135dff97 Merge branch 'PHP-5.4'
* PHP-5.4:
  Avoid calling select if maxfd returned by curl_multi_fdset is -1
  Fixing NEWS file
2012-09-22 10:19:16 -04:00
Pierrick Charron
c8687ee63b Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Avoid calling select if maxfd returned by curl_multi_fdset is -1
2012-09-22 10:18:44 -04:00
Pierrick Charron
2e8ab65270 Avoid calling select if maxfd returned by curl_multi_fdset is -1
As per libcurl documentation :

When libcurl returns -1 in max_fd, it is because libcurl currently
does something that isn't possible for your application to monitor
with a socket and unfortunately you can then not know exactly when
the current action is completed using select().
2012-09-22 10:15:40 -04:00
Pierrick Charron
70713a27b6 Add CURLOPT_READDATA which was removed by mistake
I did a check and this is the only one which was removed by mistake.
No other constants are available in 5.4 branch and not in master
2012-09-22 10:05:52 -04:00
Lars Strojny
734bda7a2d Fixing NEWS file 2012-09-21 13:22:53 +02:00
Dmitry Stogov
46458c2c65 Merge branch 'PHP-5.3' of git.php.net:php-src into PHP-5.3
* 'PHP-5.3' of git.php.net:php-src:
  updated lib versions
2012-09-21 15:17:21 +04:00
Dmitry Stogov
b69068705e Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
* 'PHP-5.4' of git.php.net:php-src:
  updated lib versions
2012-09-21 15:16:57 +04:00
Dmitry Stogov
8984de4672 Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  updated lib versions
2012-09-21 15:15:37 +04:00
Dmitry Stogov
274cbe5238 Merge branch 'PHP-5.4'
* PHP-5.4:
  Fixed bug #63111 (is_callable() lies for abstract static method)
  Fix folding

Conflicts:
	NEWS
2012-09-21 15:14:29 +04:00
Dmitry Stogov
ed3a2eec9c Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fixed bug #63111 (is_callable() lies for abstract static method)

Conflicts:
	NEWS
2012-09-21 14:18:37 +04:00
Dmitry Stogov
4db74b7f19 Fixed bug #63111 (is_callable() lies for abstract static method) 2012-09-21 13:07:14 +04:00
Anatoliy Belsky
a9d727e180 Merge branch 'PHP-5.4'
* PHP-5.4:
  updated lib versions
  Fix folding
2012-09-21 09:59:01 +02:00
Anatoliy Belsky
6c1f5eb215 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  updated lib versions
2012-09-21 09:58:16 +02:00
Anatoliy Belsky
d59c1371c2 updated lib versions 2012-09-21 09:57:22 +02:00
Gustavo Lopes
bf19838c87 Do not disable RFC3678 multicast API on Windows
The API is supported since Windows Vista and requires targeting Vista
when compiling PHP. Pierre had asked to disable this by default, even
when targeting Vista/Windows Server 2008.

Since XP will not be supported anymore on php-next, any rationale
for this option will not apply anymore.
2012-09-20 23:36:20 +02:00
Rasmus Lerdorf
fa5477d9d4 Fix folding 2012-09-20 14:24:55 -04:00
Rasmus Lerdorf
f037ddc859 Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4 2012-09-20 14:22:55 -04:00
Rasmus Lerdorf
2322be0fab Fix folding 2012-09-20 14:22:15 -04:00
Rob Richards
4b9ed49217 Merge branch 'PHP-5.4'
* PHP-5.4:
  fix bug #63015 (Incorrect arginfo for DOMErrorHandler)
2012-09-20 02:35:16 -04:00
Rob Richards
ffa72707c8 fix bug #63015 (Incorrect arginfo for DOMErrorHandler) 2012-09-20 02:34:07 -04:00
Lars Strojny
1c423601a8 Merge branch 'PHP-5.4'
Conflicts:
	ext/sockets/multicast.h
2012-09-19 22:23:22 +02:00
Lars Strojny
dd6b7ea7bd Merge branch 'PHP-5.4' of git://github.com/php/php-src into PHP-5.4 2012-09-19 22:18:16 +02:00
Lars Strojny
188c124a57 Bug #63000: MCAST_JOIN_GROUP on OSX is broken
The multicast support in PHP 5.4 makes use of MCAST_JOIN_GROUP if it is present.
The problem is that OSX 10.7 added the constant, but did not correctly implement
the feature. This causes the setsockopt call to fail.

The solution to the problem is to not use MCAST_JOIN_GROUP on OSX.

For reference, this was also done in VLC:

* http://trac.videolan.org/vlc/ticket/6104#comment:19
2012-09-19 22:17:35 +02:00
Xinchen Hui
2211300864 Merge branch 'PHP-5.4' 2012-09-19 19:52:38 +08:00
Xinchen Hui
4571d7824a Merge branch 'PHP-5.3' into PHP-5.4 2012-09-19 19:44:18 +08:00
Xinchen Hui
fd0b3ea663 Fixed bug #61442 (exception threw in __autoload can not be catched) 2012-09-19 19:40:59 +08:00
Lars Strojny
6793e09a4e Merge branch 'PHP-5.4' 2012-09-18 23:17:31 +02:00
Lars Strojny
ee172ce3cc Merging PR #116 2012-09-18 23:15:03 +02:00
Lars Strojny
d0e96a5575 Merge branch 'PHP-5.4' 2012-09-18 22:17:36 +02:00
Lars Strojny
aa133ea282 Merged GitHub PR #190: Support for the HTTP PATCH method in CLI webserver 2012-09-18 22:16:51 +02:00
Anatoliy Belsky
7be5e7539c Merge branch 'PHP-5.4'
* PHP-5.4:
  updated libary versions
2012-09-18 10:20:47 +02:00
Anatoliy Belsky
1e1db9d9bb Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  updated libary versions

Conflicts:
	win32/build/libs_version.txt
2012-09-18 10:20:05 +02:00
Anatoliy Belsky
6752f38ccc updated libary versions 2012-09-18 10:18:26 +02:00
Anatoliy Belsky
d23efb137b Merge branch 'PHP-5.4'
* PHP-5.4:
  split tests for the new zlib version on win
2012-09-18 10:02:33 +02:00