1bcc7d919c
fix datatype mismatches
2014-12-02 09:15:10 +01:00
4cba2f9811
fix datatype mismatch
2014-12-02 09:15:09 +01:00
1172aff298
fix datatype mismatches
2014-12-02 09:15:08 +01:00
c64ce84cd6
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fix possible null pointer math
2014-12-01 14:43:43 +01:00
f33bd9c846
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix possible null pointer math
2014-12-01 14:43:22 +01:00
cb6dea6ea8
fix possible null pointer math
2014-12-01 14:40:35 +01:00
3ca0ca1548
Merge remote-tracking branch 'origin/master' into native-tls
...
* origin/master: (102 commits)
fix dir separator in test
fix TS build
fix TS build
Better fix for bug #68446
Revert "Merge remote-tracking branch 'origin/PHP-5.6'"
Revert NEWS and set test to XFAIL
Revert "Fix bug #68446 (bug with constant defaults and type hints)"
Improved zend_hash_clean() and added new optimized zend_symtable_clean()
Use inline version of zval_ptr_dtor()
Added new optimized zend_array_destroy() function
Moved i_zval_ptr_dtor() from zend_execute.h to zend_variables.h
fix REGISTER_NS_*_CONSTANT macros
Removed useless assert. EG(uninitialized_zval) can't be refcounted.
Use specialized destructors when types of zvals are known.
move tests into proper place
Improved assignment to object property
Reuse zend_assign_to_variable() in zend_std_write_property()
cleanup comments from svn/cvs era
fix dir separator in test
fork test for windows
...
2014-11-26 08:17:35 +01:00
06fdf359e3
typo fixes - https://github.com/vlajos/misspell_fixer
2014-11-23 14:52:47 -08:00
4dc994571d
typo fixes - https://github.com/vlajos/misspell_fixer
...
Conflicts:
ext/ftp/ftp.h
ext/pcre/pcrelib/pcre_printint.c
ext/pcre/pcrelib/sljit/sljitLir.c
ext/pcre/pcrelib/sljit/sljitLir.h
ext/pcre/pcrelib/sljit/sljitNativeARM_32.c
ext/pcre/pcrelib/sljit/sljitNativeTILEGX_64.c
ext/pgsql/pgsql.c
ext/phar/func_interceptors.c
ext/soap/soap.c
ext/standard/image.c
2014-11-23 14:33:43 -08:00
c6bad96f30
Merge remote-tracking branch 'origin/master' into native-tls
...
* origin/master: (398 commits)
NEWS
add test for bug #68381
Fixed bug #68381 Set FPM log level earlier during init
proper dllexport
move to size_t where zend_string is used internally
fix some datatype mismatches
return after the warning, to fix uninitialized salt usage
fix datatype mismatches
add missing type specifier
fix datatype mismatches
fix unsigned check
"extern" shouldn't be used for definitions
joined identical conditional blocks
simplify fpm tests
SEND_VAR_NO_REF optimization
Add test for bug #68442
Add various tests for FPM - covering recent bugs (68420, 68421, 68423, 68428) - for UDS - for ping and status URI - for multi pool and multi mode
Include small MIT FastCGI client library from https://github.com/adoy/PHP-FastCGI-Client
Get rid of zend_free_op structure (use zval* instead). Get rid of useless TSRMLS arguments.
Add new FPM test for IPv4/IPv6
...
Conflicts:
win32/build/config.w32
2014-11-18 21:18:52 +01:00
f00cf67d1e
C89 compat
2014-11-12 17:57:19 +01:00
54868c84ce
fix int to void* cast on x64
2014-11-12 17:57:15 +01:00
1106b10ae8
Fix #66479 : Wrong response to FCGI_GET_VALUES
...
Requesting Get-Values via FCGI caused an "endless" loop over the last requested parameter and ended with an invalid response. this patch solves this loop bug.
2014-10-30 13:24:06 +01:00
aff66a94a6
don't define tsrm ls in SAPIs under linux
...
as it's compiled statically with the core
2014-10-15 16:55:47 +02:00
8aeffdd74c
moved most of the core to use static tsrm ls cache pointer
...
plus apache2handler, cli and cgi
2014-10-15 16:33:40 +02:00
97319bc833
fix signed/unsigned mismatch
2014-10-13 18:43:10 +02:00
8eb7e7bf7f
Merge branch 'master' into issue-67910
...
Conflicts:
README.PARAMETER_PARSING_API
ext/gmp/tests/001.phpt
2014-09-20 10:09:21 +02:00
cf0303e782
Replaces php5 with php7, without whitespace changes.
2014-09-20 10:01:44 +02:00
d0cb715373
s/PHP 5/PHP 7/
2014-09-19 18:33:14 +02:00
5cf17fc8bf
reduce struct size by 8 byte on 64 bit
2014-09-14 22:31:01 +02:00
b75a058810
fix ftell/fseek calls
2014-09-14 22:28:42 +02:00
69d6e093e9
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fixed the cast and incompatible pointer warning
Conflicts:
sapi/cgi/fastcgi.c
2014-09-12 14:37:54 +02:00
bcdbd47117
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fixed the cast and incompatible pointer warning
2014-09-12 14:36:54 +02:00
fdfc31a4f7
fixed the cast and incompatible pointer warning
2014-09-12 14:36:00 +02:00
6561d03a41
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>)
2014-09-08 16:24:46 +04:00
4a12b4cef9
closesocket is defined in php_network.h
2014-08-28 13:20:43 +08:00
7a90e40af7
closesocket is already defined in main/php_network.h
2014-08-28 13:18:55 +08:00
202e8db1dc
fixed several long vs zend_long casts
2014-08-26 11:26:53 +02:00
59848e3fbb
Remove ZEND_ACC_INTERACTIVE and CG(interactive)
...
As far as I can discern these are leftovers of the interactive
shell implementation that was used before PHP 5.4. Now the readline
ext makes use of normal eval calls for this.
So, dropping these until there is evidence to the contrary, as they
currently wouldn't work anyway.
2014-08-25 23:46:43 +02:00
4d997f63d9
master renames phase 3
2014-08-25 20:22:49 +02:00
c3e3c98ec6
master renames phase 1
2014-08-25 19:24:55 +02:00
21f623e945
ported fcgi
2014-08-19 23:12:17 +02:00
63d3f0b844
basic macro replacements, all at once
2014-08-19 08:07:31 +02:00
54906c760f
increase the stack size for cli and cgi
2014-08-16 16:45:05 +02:00
c1c913c5f1
cleanup (we don't have to duplicate elements of module_registry)
2014-08-13 17:05:18 +04:00
110bf9c720
Merge remote-tracking branch 'origin/master' into phpng
...
Conflicts:
Zend/zend_compile.h
ext/openssl/xp_ssl.c
2014-07-18 16:25:43 +08:00
3b08082600
This test depends on expose_php being on
2014-07-14 08:22:05 -07:00
935bc5795f
This test depends on expose_php being on
2014-07-14 08:21:57 -07:00
40955e27f7
This test depends on expose_php being on
2014-07-14 08:21:27 -07:00
c2082ece52
Fixed apply_func_t (they should be broken before)
2014-05-25 18:32:35 +08:00
47335ef956
fix casting
2014-05-15 20:30:30 +02:00
c242518bf0
There should been memory leaks(and don't use pointer cast)
2014-05-08 15:20:13 +08:00
257bf697ae
Fix php-cgi -m
2014-05-01 00:25:23 +02:00
f9927a6c97
Merge mainstream 'master' branch into refactoring
...
During merge I had to revert:
Nikita's patch for php_splice() (it probably needs to be applyed again)
Bob Weinand's patches related to constant expression handling (we need to review them carefully)
I also reverted all our attempts to support sapi/phpdbg (we didn't test it anyway)
Conflicts:
Zend/zend.h
Zend/zend_API.c
Zend/zend_ast.c
Zend/zend_compile.c
Zend/zend_compile.h
Zend/zend_constants.c
Zend/zend_exceptions.c
Zend/zend_execute.c
Zend/zend_execute.h
Zend/zend_execute_API.c
Zend/zend_hash.c
Zend/zend_highlight.c
Zend/zend_language_parser.y
Zend/zend_language_scanner.c
Zend/zend_language_scanner_defs.h
Zend/zend_variables.c
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
ext/date/php_date.c
ext/dom/documenttype.c
ext/hash/hash.c
ext/iconv/iconv.c
ext/mbstring/tests/zend_multibyte-10.phpt
ext/mbstring/tests/zend_multibyte-11.phpt
ext/mbstring/tests/zend_multibyte-12.phpt
ext/mysql/php_mysql.c
ext/mysqli/mysqli.c
ext/mysqlnd/mysqlnd_reverse_api.c
ext/mysqlnd/php_mysqlnd.c
ext/opcache/ZendAccelerator.c
ext/opcache/zend_accelerator_util_funcs.c
ext/opcache/zend_persist.c
ext/opcache/zend_persist_calc.c
ext/pcre/php_pcre.c
ext/pdo/pdo_dbh.c
ext/pdo/pdo_stmt.c
ext/pdo_pgsql/pgsql_driver.c
ext/pgsql/pgsql.c
ext/reflection/php_reflection.c
ext/session/session.c
ext/spl/spl_array.c
ext/spl/spl_observer.c
ext/standard/array.c
ext/standard/basic_functions.c
ext/standard/html.c
ext/standard/mail.c
ext/standard/php_array.h
ext/standard/proc_open.c
ext/standard/streamsfuncs.c
ext/standard/user_filters.c
ext/standard/var_unserializer.c
ext/standard/var_unserializer.re
main/php_variables.c
sapi/phpdbg/phpdbg.c
sapi/phpdbg/phpdbg_bp.c
sapi/phpdbg/phpdbg_frame.c
sapi/phpdbg/phpdbg_help.c
sapi/phpdbg/phpdbg_list.c
sapi/phpdbg/phpdbg_print.c
sapi/phpdbg/phpdbg_prompt.c
2014-04-26 00:32:51 +04:00
72c287bd23
Combine HashTable.flags and HashTable.nApplyCount into single 32-bit word
2014-04-21 18:25:34 +04:00
050d7e38ad
Cleanup (1-st round)
2014-04-15 15:40:40 +04:00
ccf863c8ce
Merge branch 'PHP-5.6'
2014-04-11 19:35:11 +02:00
99d1a1bb3f
Shut up, my lovely compiler; I do not like your warnings
2014-04-11 19:33:56 +02:00
76cc99fe60
Refactored ZVAL flags usage to simplify various checks (e.g. Z_REFCOUNTED(), candidate for GC, etc)
2014-04-03 15:26:23 +04:00
1b6327fd3b
Fixed string length
2014-03-17 21:38:48 +04:00
Anatol Belski