8034fdc9d9
Use int instead of integer in proto
2018-02-02 22:32:15 +01:00
ba298725d1
Changed CATCH instruction format (extended_value moved into op2, op2 into result, result into extended_value)
2018-01-31 22:39:30 +03:00
3c6e1c2b81
Merge branch 'PHP-7.2'
...
* PHP-7.2:
Fix race conditions with Apache vhost vs. per dir config
2018-01-31 20:26:20 +01:00
73eb5a78b9
Fix race conditions with Apache vhost vs. per dir config
...
If the same php_value/php_flag is present in httpd.conf and .htaccess,
the key is potentially shared between threads. Unfortunately we can't
intern these keys using the current mechanism, because the MPM is setup
before the SAPI module setup is even started. A more elegant way were
to implement a kind of string pool for the thread safe Apache SAPI
config directives with the mechanism similar to what is done for the
SAPI setup now, but doing a separate management.
2018-01-31 20:15:30 +01:00
0e10bed83e
Remove double include of fpm_scoreboard.h
2018-01-15 12:22:04 +01:00
50431d0820
Merge branch 'PHP-7.2'
...
* PHP-7.2:
Fix invalid free
2018-01-13 12:33:45 +01:00
1350f4f997
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Fix invalid free
2018-01-13 12:33:02 +01:00
2503a27ae0
Fix invalid free
2018-01-13 12:32:22 +01:00
b942648771
Merge branch 'PHP-7.2'
2018-01-12 18:18:45 +01:00
f8c889760c
Merge branch 'PHP-7.1' into PHP-7.2
2018-01-12 18:18:34 +01:00
9e98e99a3a
Revert "Fixed bug #75287 (Builtin webserver crash after chdir in a shutdown function)"
...
This reverts commit 816758eda2
2018-01-12 18:11:12 +01:00
1d0ac9819a
Use PHP_WIN32
2018-01-04 08:14:41 +01:00
471da3eddc
Trailing whitespaces on sapi/*
...
Signed-off-by: Gabriel Caruso <carusogabriel34@gmail.com >
2018-01-04 02:39:54 -02:00
6400264856
Trailing whitespaces
...
Signed-off-by: Gabriel Caruso <carusogabriel34@gmail.com >
2018-01-03 14:38:00 +01:00
a76eeea736
Merge branch 'PHP-7.2'
...
* PHP-7.2:
Happy new year (Update copyright to 2018)
Conflicts:
ext/phar/LICENSE
2018-01-03 16:02:15 +08:00
0e62639d28
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Happy new year (Update copyright to 2018)
2018-01-03 16:00:34 +08:00
fbfdd1e1c4
Happy new year (Update copyright to 2018)
2018-01-02 23:42:29 +02:00
b65abecfdf
regenerated with newer re2c
2018-01-02 13:54:29 +08:00
a6519d0514
year++
2018-01-02 12:57:58 +08:00
7a7ec01a49
year++
2018-01-02 12:55:14 +08:00
ccd4716ec7
year++
2018-01-02 12:53:31 +08:00
d6b2756da1
Merge branch 'PHP-7.2'
...
* PHP-7.2:
Updated NEWS
Fixed bug #75735 ([embed SAPI] Segmentation fault in sapi_register_post_entry)
2017-12-27 12:52:44 +08:00
6693898b30
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Fixed bug #75735 ([embed SAPI] Segmentation fault in sapi_register_post_entry)
2017-12-27 12:52:06 +08:00
dc3822c343
Fixed bug #75735 ([embed SAPI] Segmentation fault in sapi_register_post_entry)
2017-12-27 12:51:50 +08:00
171ecbb8d1
Fix darwin builds of phpdbg using frameworks
2017-12-21 17:03:04 -05:00
168c6cda8f
Transmit phpdbg webdata len in little-endian
...
Rather than using machine-endianness through a UB cast.
2017-12-17 00:24:45 +01:00
abdece72c2
Merge branch 'PHP-7.2'
2017-12-16 17:21:06 +01:00
f01d5faf30
Merge branch 'PHP-7.1' into PHP-7.2
2017-12-16 17:21:01 +01:00
14393b5fb3
Move includes in ps_title.c
...
The HAVE_UNISTD_H check has to be after including config.h.
Also include sys/types.h, which may be needed for setproctitle.
2017-12-16 17:20:05 +01:00
a7b6812ae6
Fixed stream handler override
2017-12-14 23:55:57 +03:00
83e495e0fd
Move constants into read-only data segment
2017-12-14 22:14:36 +03:00
9e709e2fa0
Move constants into read-only data segment
2017-12-14 18:43:44 +03:00
c890d469fa
Use array specific functions
2017-12-07 15:20:17 +03:00
7cc6f60134
Added "argv" and "argc" as known strings.
...
Fixed incorrect "argc" update and corresponding phpdbg test.
2017-12-01 01:35:47 +03:00
821bdbdfba
Merge branch 'PHP-7.2'
...
* PHP-7.2:
Revert "Fix macro redefinition warnings"
2017-11-30 13:23:18 +01:00
b6a27c7332
Revert "Fix macro redefinition warnings"
...
This reverts commit 23d2bd3748
2017-11-30 13:21:04 +01:00
a415006b5e
Merge branch 'PHP-7.2'
...
* PHP-7.2:
Fix macro redefinition warnings
2017-11-30 12:41:44 +01:00
23d2bd3748
Fix macro redefinition warnings
...
The corresponding implementations are available from APR.
2017-11-30 12:40:52 +01:00
a935ad927e
Merge branch 'PHP-7.2'
...
* PHP-7.2:
Follow up on bug #75574 for FCGI side
2017-11-28 20:35:19 +01:00
0b30461764
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Follow up on bug #75574 for FCGI side
2017-11-28 20:34:44 +01:00
8b57a5bca0
Follow up on bug #75574 for FCGI side
2017-11-28 20:33:11 +01:00
af55904f18
Merge branch 'PHP-7.2'
...
* PHP-7.2:
Fixed bug #73830 Directory does not exist.
2017-11-28 12:43:03 +01:00
79940993de
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Fixed bug #73830 Directory does not exist.
2017-11-28 12:42:40 +01:00
578049fdb6
Fixed bug #73830 Directory does not exist.
2017-11-28 12:41:49 +01:00
287a2b0184
fix constant defined undefined behavior warning
2017-11-24 19:01:46 +01:00
7d5691cd69
Fix some printf() specifier usages
...
Use PRIu32 when printing uint32_t.
Fix some %u/%d confusions.
Add some casts where types are not standardized.
2017-11-21 22:50:27 +01:00
3ce1a977d4
Merge branch 'PHP-7.2'
2017-11-17 22:26:04 +01:00
1310234aa3
Fix printf format issues on i386
2017-11-17 22:25:03 +01:00
26f8fc833b
Enable and fix printf() format warnings
...
Add _unchecked() variants of zend_spprintf and zend_strpprintf for
cases where we specifically want to disable these checks, such as
use of %H.
2017-11-16 21:15:36 +01:00
85021602ba
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Update NEWS
Fix bug 60471 by correctly identifying unused speculative preconnections
2017-11-14 20:03:02 +01:00
Gabriel Caruso