]>
granicus.if.org Git - php/log
Dmitry Stogov [Thu, 11 Sep 2014 07:06:47 +0000 (11:06 +0400)]
Revert "Updated UPGRADING for ext/ereg removal"
This reverts commit
610ef5d7ecadb26a491aa9fc8ec7439e4016a3fc .
Tjerk Meesters [Wed, 10 Sep 2014 13:03:36 +0000 (21:03 +0800)]
Updated UPGRADING for ext/ereg removal
Tjerk Meesters [Thu, 28 Aug 2014 08:41:38 +0000 (16:41 +0800)]
Removing ext/ereg and dependencies
Affected extensions:
- opcache (use pcre)
- mbstring (removed ereg functions overloading)
- pgsql (use pcre)
- reflection (test cases using 'ereg')
SAPI:
- apache (header only)
- apache_hooks (header only)
Anatol Belski [Wed, 10 Sep 2014 17:32:25 +0000 (19:32 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
fix precision when fetching float through mysqlnd
Anatol Belski [Wed, 10 Sep 2014 17:31:59 +0000 (19:31 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix precision when fetching float through mysqlnd
Anatol Belski [Wed, 10 Sep 2014 17:29:11 +0000 (19:29 +0200)]
fix precision when fetching float through mysqlnd
fixes failing ext/mysqli/tests/010.phpt
Michael Wallner [Wed, 10 Sep 2014 11:31:39 +0000 (13:31 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
make LTP version check a blacklist
Michael Wallner [Wed, 10 Sep 2014 11:31:22 +0000 (13:31 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
make LTP version check a blacklist
Michael Wallner [Wed, 10 Sep 2014 11:30:52 +0000 (13:30 +0200)]
make LTP version check a blacklist
Anatol Belski [Wed, 10 Sep 2014 11:22:23 +0000 (13:22 +0200)]
replace zend_hash_find with zend_hash_str_find which fixes leaking the key
Anatol Belski [Wed, 10 Sep 2014 10:40:32 +0000 (12:40 +0200)]
second big shot on porting ext/oci8
still a lot to do, but most raw things done
Anatol Belski [Tue, 9 Sep 2014 19:50:26 +0000 (21:50 +0200)]
first shot on fixing ext/oci8
Anatol Belski [Tue, 9 Sep 2014 11:12:26 +0000 (13:12 +0200)]
basic datatype fixes for ext/oci8
Dmitry Stogov [Wed, 10 Sep 2014 09:02:01 +0000 (13:02 +0400)]
Don't miss warning messages
Matteo Beccati [Wed, 10 Sep 2014 05:32:36 +0000 (07:32 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
FR #67990 - Added nowait argument to sem_acquire
Matteo Beccati [Fri, 25 Jul 2014 09:21:47 +0000 (11:21 +0200)]
FR #67990 - Added nowait argument to sem_acquire
Stanislav Malyshev [Tue, 9 Sep 2014 23:20:20 +0000 (16:20 -0700)]
Merge branch 'PHP-5.6'
* PHP-5.6:
update NEWS
Stanislav Malyshev [Tue, 9 Sep 2014 23:11:32 +0000 (16:11 -0700)]
update NEWS
Daniel Lowrey [Tue, 9 Sep 2014 16:25:36 +0000 (10:25 -0600)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Bug #41631: Fix regression from first attempt (
6569db8 )
Bug #67965: Fix blocking behavior in non-blocking crypto streams
Daniel Lowrey [Tue, 9 Sep 2014 16:24:40 +0000 (10:24 -0600)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Bug #41631: Fix regression from first attempt (
6569db8 )
Bug #67965: Fix blocking behavior in non-blocking crypto streams
Daniel Lowrey [Tue, 9 Sep 2014 15:27:20 +0000 (09:27 -0600)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Bug #41631: Fix regression from first attempt (
6569db8 )
Bug #67965: Fix blocking behavior in non-blocking crypto streams
Daniel Lowrey [Tue, 9 Sep 2014 13:50:15 +0000 (07:50 -0600)]
Bug #41631: Fix regression from first attempt (
6569db8 )
Daniel Lowrey [Tue, 9 Sep 2014 13:37:57 +0000 (07:37 -0600)]
Bug #67965: Fix blocking behavior in non-blocking crypto streams
Tjerk Meesters [Tue, 9 Sep 2014 11:32:09 +0000 (19:32 +0800)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed #67985 - Incorrect last used array index copied to new array after unset
Conflicts:
Zend/zend_variables.c
Tjerk Meesters [Tue, 9 Sep 2014 10:04:09 +0000 (18:04 +0800)]
Updated NEWS for #67985
Tjerk Meesters [Tue, 9 Sep 2014 10:03:10 +0000 (18:03 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed #67985 - Incorrect last used array index copied to new array after unset
Tjerk Meesters [Tue, 9 Sep 2014 10:02:45 +0000 (18:02 +0800)]
Updated NEWS for #67985
Tjerk Meesters [Tue, 9 Sep 2014 10:00:49 +0000 (18:00 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed #67985 - Incorrect last used array index copied to new array after unset
Tjerk Meesters [Tue, 9 Sep 2014 09:58:45 +0000 (17:58 +0800)]
Fixed #67985 - Incorrect last used array index copied to new array after unset
In master zend_array_dup() is used to do this properly; this is a workaround.
Michael Wallner [Tue, 9 Sep 2014 04:56:33 +0000 (06:56 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
duplicate value's string for the SAPI filter
Fine tuned the order of adding request variables.
Michael Wallner [Tue, 9 Sep 2014 04:54:23 +0000 (06:54 +0200)]
duplicate value's string for the SAPI filter
reported by sesser; tyrael, do you take care of the bug/NEWS?
George Wang [Tue, 9 Sep 2014 03:58:05 +0000 (23:58 -0400)]
Fine tuned the order of adding request variables.
George Wang [Tue, 9 Sep 2014 03:58:05 +0000 (23:58 -0400)]
Fine tuned the order of adding request variables.
George Wang [Tue, 9 Sep 2014 03:58:05 +0000 (23:58 -0400)]
Fine tuned the order of adding request variables.
George Wang [Tue, 9 Sep 2014 03:58:05 +0000 (23:58 -0400)]
Fine tuned the order of adding request variables.
Xinchen Hui [Tue, 9 Sep 2014 03:52:25 +0000 (11:52 +0800)]
Remove unnecessary branch/temp variable
Dmitry Stogov [Mon, 8 Sep 2014 20:50:44 +0000 (00:50 +0400)]
Don't anload zend extensions if ZEND_DONT_UNLOAD_MODULES environment variable is set
Dmitry Stogov [Mon, 8 Sep 2014 20:40:14 +0000 (00:40 +0400)]
We don't need to check for xlat entry twice
Dmitry Stogov [Mon, 8 Sep 2014 20:12:36 +0000 (00:12 +0400)]
Fixed GC problem (arrays may be recorded as possible root of garbage cycle. we have to clear this info before deleting array)
Adam Harvey [Mon, 8 Sep 2014 19:31:58 +0000 (19:31 +0000)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix bug #67972 (SessionHandler Invalid memory read create_sid()).
Update LSAPI to 6.7, added support for 'filter_input'. Fixed a crash in CLI mode.
5.5.18 now
Adam Harvey [Mon, 8 Sep 2014 19:28:15 +0000 (19:28 +0000)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix bug #67972 (SessionHandler Invalid memory read create_sid()).
Update LSAPI to 6.7, added support for 'filter_input'. Fixed a crash in CLI mode.
5.5.18 now
Conflicts:
configure.in
main/php_version.h
Adam Harvey [Mon, 8 Sep 2014 19:25:14 +0000 (19:25 +0000)]
Fix bug #67972 (SessionHandler Invalid memory read create_sid()).
SessionHandler::create_sid() didn't check if PS(default_mod) was initialised
before attempting to call its create_sid() handler.
Anatol Belski [Mon, 8 Sep 2014 18:34:26 +0000 (20:34 +0200)]
made Visual Studio to understand that zend_error_noreturn() will not return
- windows only, on linux gcc would cause a warning that the function returns,
as no noreturn functions are used
- ZEND_NORETURN works on windows as well now, using __declspec(noreturn),
which is useful for the other cases
- one more function call will be needed, which is not critical for the
error reporting
- the way is open to enable the same for gcc as soon as it's not causing a warning
Dmitry Stogov [Mon, 8 Sep 2014 12:24:46 +0000 (16:24 +0400)]
Added ability to make a number of "warmup" requests before an actual benchmark.
(php-cgi -T [<number-of-warmup-requests>,]<number-of-benchmark-requests> <file>)
Nikita Popov [Mon, 8 Sep 2014 11:50:53 +0000 (13:50 +0200)]
Fix parser stack destruction with dummy ENCAPSED_AND_WHITESPACE
T_ENCAPSED_AND_WHITESPACE is now specified to always hold a value,
so give it a NULL value in the dummy cases.
Dmitry Stogov [Mon, 8 Sep 2014 11:46:45 +0000 (15:46 +0400)]
Removed IS_STR_OFFSET type and corresponding macros. Optimized string offset handling in ASSIGN_DIM opcode.
Dmitry Stogov [Mon, 8 Sep 2014 07:08:05 +0000 (11:08 +0400)]
Fixed comments and removed useless code.
Anatol Belski [Sun, 7 Sep 2014 18:26:01 +0000 (20:26 +0200)]
fix null pointer deref
Anatol Belski [Sun, 7 Sep 2014 18:11:49 +0000 (20:11 +0200)]
fixed the tests, related to the basename behaviour, bug #66395
Anatol Belski [Sun, 7 Sep 2014 11:34:18 +0000 (13:34 +0200)]
fixed string index handling with references
Anatol Belski [Sat, 6 Sep 2014 22:54:47 +0000 (00:54 +0200)]
fix 64 bit string index usage
Nikita Popov [Sat, 6 Sep 2014 20:12:37 +0000 (22:12 +0200)]
Revert "Move safe_address into zend_multiply.h"
This reverts commit
43b02e169c718335a82b8c90c3252194f988659a .
I'm getting symbol resolution issues for zend_error_noreturn in the
opcache.so, so reverting this for now.
Nikita Popov [Sat, 6 Sep 2014 11:47:05 +0000 (13:47 +0200)]
Move safe_address into zend_multiply.h
This allows reuse in zend_arena_calloc.
Also renamed the function to zend_safe_address as it's no longer
private to the allocator.
Tjerk Meesters [Sat, 6 Sep 2014 11:14:43 +0000 (19:14 +0800)]
According to LSB 3.2, finite() has been deprecated with C99.
See: https://refspecs.linuxfoundation.org/LSB_3.2.0/LSB-Core-generic/LSB-Core-generic/baselib-finite.html
Changed the order in which we detect whether to use finite() or isfinite(), favouring the latter.
Tjerk Meesters [Sat, 6 Sep 2014 10:56:22 +0000 (18:56 +0800)]
Added test case to complement commit
29397f8
Nikita Popov [Sat, 6 Sep 2014 10:52:51 +0000 (12:52 +0200)]
Release memory for PDO Stmt ctor args
Nikita Popov [Sat, 6 Sep 2014 10:19:55 +0000 (12:19 +0200)]
Fix $x .= $x
Also add a nice comment pointing out that concat runs on magic.
Nikita Popov [Fri, 5 Sep 2014 18:29:50 +0000 (20:29 +0200)]
Fix ext/xml warnings
Dmitry Stogov [Fri, 5 Sep 2014 12:13:06 +0000 (16:13 +0400)]
Fixed overflow check
Nikita Popov [Fri, 5 Sep 2014 10:44:51 +0000 (12:44 +0200)]
Fix string increment
Dmitry Stogov [Fri, 5 Sep 2014 10:18:39 +0000 (14:18 +0400)]
Fixed support for C++
Nikita Popov [Fri, 5 Sep 2014 09:50:31 +0000 (11:50 +0200)]
Fix overflow check for string concatenation
Also do the overflow check for both branches, not just the realloc
one.
And clean up the code a bit - move common parts outside of the
realloc/alloc branches.
Nikita Popov [Fri, 5 Sep 2014 09:34:49 +0000 (11:34 +0200)]
Drop some unsafe-looking casting code from ext/socket
ZVAL_COPY before convert_to_string is probably not right.
Nikita Popov [Thu, 4 Sep 2014 23:03:29 +0000 (01:03 +0200)]
Remove old zend_string_to_double function
Nikita Popov [Thu, 4 Sep 2014 20:50:34 +0000 (22:50 +0200)]
Fix readline warnings
Nikita Popov [Thu, 4 Sep 2014 20:49:56 +0000 (22:49 +0200)]
Fix SOAP warnings
Xinchen Hui [Fri, 5 Sep 2014 01:31:05 +0000 (09:31 +0800)]
Fixed discards qualifiers from pointer target type
Xinchen Hui [Fri, 5 Sep 2014 01:22:23 +0000 (09:22 +0800)]
Merge branch 'master' of https://git.php.net/repository/php-src
Nikita Popov [Thu, 4 Sep 2014 20:29:30 +0000 (22:29 +0200)]
Fix invalid zend_string free in soap
By making get_http_headers() return the zend_string* directly.
Nikita Popov [Thu, 4 Sep 2014 19:55:27 +0000 (21:55 +0200)]
Fix smart_str_append()
Would segfault if src->s == NULL.
Nikita Popov [Thu, 4 Sep 2014 19:23:11 +0000 (21:23 +0200)]
Merge branch 'PHP-5.6'
Conflicts:
ext/soap/php_http.c
Nikita Popov [Thu, 4 Sep 2014 19:14:17 +0000 (21:14 +0200)]
Split GMP tests testing multiple functions
Also drop dummy test
Nikita Popov [Thu, 4 Sep 2014 19:10:41 +0000 (21:10 +0200)]
Give proper names to GMP test files
Nikita Popov [Thu, 4 Sep 2014 18:55:09 +0000 (20:55 +0200)]
Throw warnings when using zero modulus in gmp_powm
Also fixes a leak in this case.
Tjerk Meesters [Thu, 4 Sep 2014 18:17:42 +0000 (02:17 +0800)]
Merge branch 'pr/804'
* pr/804:
Adds phpversion test to prevent #67959
Florian MARGAINE [Thu, 4 Sep 2014 18:13:43 +0000 (20:13 +0200)]
Adds phpversion test to prevent #67959
Tjerk Meesters [Thu, 4 Sep 2014 18:05:06 +0000 (02:05 +0800)]
Updated NEWS for #67959
Nikita Popov [Thu, 4 Sep 2014 18:00:32 +0000 (20:00 +0200)]
Add GMP tests for some uncovered branches
Tjerk Meesters [Thu, 4 Sep 2014 18:02:20 +0000 (02:02 +0800)]
Merge branch 'pr/803'
* pr/803:
Fixes zpp parameter from int to size_t
Florian MARGAINE [Thu, 4 Sep 2014 17:58:40 +0000 (19:58 +0200)]
Fixes zpp parameter from int to size_t
Dmitry Stogov [Thu, 4 Sep 2014 10:06:22 +0000 (14:06 +0400)]
Fixed compilation warnings
Xinchen Hui [Thu, 4 Sep 2014 08:26:53 +0000 (16:26 +0800)]
it's should be zend_ulong
Xinchen Hui [Thu, 4 Sep 2014 03:59:58 +0000 (11:59 +0800)]
Revert previous commit by mistake
Xinchen Hui [Thu, 4 Sep 2014 03:56:13 +0000 (11:56 +0800)]
Use PHP_GINIT to suppress incompatible pointer type
Tjerk Meesters [Wed, 3 Sep 2014 23:00:14 +0000 (07:00 +0800)]
Updated NEWS for #67955
Tjerk Meesters [Wed, 3 Sep 2014 22:58:04 +0000 (06:58 +0800)]
Fixed #67955: SoapClient prepends 0-byte to cookie names
Nikita Popov [Wed, 3 Sep 2014 19:35:53 +0000 (21:35 +0200)]
Fix DOM warnings
Nikita Popov [Wed, 3 Sep 2014 18:37:04 +0000 (20:37 +0200)]
Separate php_mb_reset() from php_mblen()
Instead of fighting against warnings ...
George Wang [Wed, 3 Sep 2014 15:24:45 +0000 (11:24 -0400)]
Update LSAPI to 6.7, added support for 'filter_input'.
Fixed a crash in CLI mode.
George Wang [Wed, 3 Sep 2014 15:28:30 +0000 (11:28 -0400)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
George Wang [Wed, 3 Sep 2014 15:24:45 +0000 (11:24 -0400)]
Update LSAPI to 6.7, added support for 'filter_input'.
Fixed a crash in CLI mode.
George Wang [Wed, 3 Sep 2014 15:24:45 +0000 (11:24 -0400)]
Update LSAPI to 6.7, added support for 'filter_input'.
Fixed a crash in CLI mode.
Nikita Popov [Wed, 3 Sep 2014 14:32:01 +0000 (16:32 +0200)]
Fix ftp_login()
Nikita Popov [Wed, 3 Sep 2014 14:10:56 +0000 (16:10 +0200)]
Fix Z_UL
Dmitry Stogov [Wed, 3 Sep 2014 14:21:36 +0000 (18:21 +0400)]
Preallocate hash tables of required size
Nikita Popov [Wed, 3 Sep 2014 13:57:28 +0000 (15:57 +0200)]
Fix a number of format issues
Nikita Popov [Wed, 3 Sep 2014 13:36:04 +0000 (15:36 +0200)]
Disable format string checking by default
Instead of removing format attributes altogether, disable the checks
by default. This allows you to do a build with format string checks
and filter out the false positives (basically anything mentioning
%p).
Nikita Popov [Wed, 3 Sep 2014 13:22:08 +0000 (15:22 +0200)]
Revert "remove a few gcc format attributes from some printf-like functions"
This reverts commit
25f5ba94aca1e89ee5f0c66513e58826afa3b853 .
Nikita Popov [Wed, 3 Sep 2014 13:16:32 +0000 (15:16 +0200)]
Use zval_ptr_dtor_nogc to destroy literals
Also move the definition of zval_ptr_dtor_nogc to zend_variables.h
(from zend_execute.h/.c) as it's used in a few places.
Philip Hofstetter [Wed, 3 Sep 2014 12:35:40 +0000 (14:35 +0200)]
fix bug #67955
this fixes a regression from
6c2a8068207a02b3d7ae7416a9967dad0a81e61f .
smart_str_appendl is expecting the length as the length of the string,
but key_length is the byte length of the key, including the 0
terminator.
As such, the cookie name appeneded to the header would now also include
the 0 terminator of the key name which then would be sent to the server.