clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-26 20:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
78,505 Commits 494 Branches 1,367 Tags 881 MiB
eacab735e0
Commit Graph

78505 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
krakjoe
eacab735e0 Merge branch 'PHP-5.6' 
* PHP-5.6:
  clean symbols
 2014-02-02 15:10:28 +00:00
krakjoe
407d761d09 clean symbols 2014-02-02 15:10:17 +00:00
krakjoe
8aaec7d1c3 Merge branch 'PHP-5.6' 
* PHP-5.6:
  another patch from upstream
 2014-02-02 14:59:30 +00:00
krakjoe
e8519bc207 another patch from upstream 2014-02-02 14:58:39 +00:00
krakjoe
202dcc0f6a Merge branch 'PHP-5.6' 
* PHP-5.6:
  woops
 2014-02-02 14:50:43 +00:00
krakjoe
6a6bec44ad woops 2014-02-02 14:50:32 +00:00
krakjoe
ee42849f8f Merge branch 'PHP-5.6' 
* PHP-5.6:
  better use of tmpnam/mkstemp
 2014-02-02 14:42:54 +00:00
krakjoe
9e84124e2d better use of tmpnam/mkstemp 2014-02-02 14:42:31 +00:00
krakjoe
37f4f132fc Merge branch 'PHP-5.6' 
* PHP-5.6:
  update version
 2014-02-02 14:05:03 +00:00
krakjoe
4a96a75c7d update version 2014-02-02 14:04:47 +00:00
krakjoe
4c6816ddf2 Merge branch 'PHP-5.6' 
* PHP-5.6:
  remove use of zend directly, avoid leaks/bugs in modules etc
 2014-02-02 13:51:05 +00:00
krakjoe
dc02b5a1fd Merge branch 'master' of https://git.php.net/repository/php-src 2014-02-02 13:50:54 +00:00
krakjoe
a58c74f1c7 remove use of zend directly, avoid leaks/bugs in modules etc 2014-02-02 13:43:43 +00:00
krakjoe
a4a120d66a Merge branch 'PHP-5.6' of https://git.php.net/repository/php-src into PHP-5.6 2014-02-02 13:42:01 +00:00
Daniel Lowrey
f08e8772a7 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Remove #if PHP_VERSION_ID version checks

Conflicts:
	ext/openssl/xp_ssl.c
 2014-02-01 08:25:01 -07:00
Daniel Lowrey
0893a13e32 Remove #if PHP_VERSION_ID version checks 2014-02-01 08:13:53 -07:00
Daniel Lowrey
05c309f2d8 Remove #if PHP_VERSION_ID version checks 2014-02-01 08:01:13 -07:00
Daniel Lowrey
f197dafd1c Merge branch 'PHP-5.6' 
* PHP-5.6:
  Use master-agnostic zend_is_true checks

Conflicts:
	ext/openssl/xp_ssl.c
 2014-01-31 14:22:35 -07:00
Daniel Lowrey
58293fb533 Use master-agnostic zend_is_true checks 2014-01-31 14:18:31 -07:00
Anatol Belski
5ed1bdf9a5 fix ZTS build 2014-01-30 10:47:58 +01:00
Stanislav Malyshev
11e47b1cdc Merge branch 'PHP-5.6' 
* PHP-5.6:
  tests still failing, so xfail for now until fixed
  tests still failing, so xfail for now until fixed
  tests still failing, so xfail for now until fixed
 2014-01-29 23:48:44 -08:00
Stanislav Malyshev
d76a6a3e4d tests still failing, so xfail for now until fixed 2014-01-29 23:48:44 -08:00
Stanislav Malyshev
1207461d14 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  tests still failing, so xfail for now until fixed
  tests still failing, so xfail for now until fixed
 2014-01-29 23:48:34 -08:00
Stanislav Malyshev
8071de3dfd tests still failing, so xfail for now until fixed 2014-01-29 23:48:33 -08:00
Stanislav Malyshev
e79b54c4b5 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  tests still failing, so xfail for now until fixed
 2014-01-29 23:48:19 -08:00
Stanislav Malyshev
c24f11450f tests still failing, so xfail for now until fixed 2014-01-29 23:48:19 -08:00
Stanislav Malyshev
770aeeb40c tests still failing, so xfail for now until fixed 2014-01-29 23:48:07 -08:00
Yasuo Ohgaki
210b444e1d Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug data->fd not set to -1 for open_basedir failure.
 2014-01-30 14:17:11 +09:00
Yasuo Ohgaki
53e3023566 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug data->fd not set to -1 for open_basedir failure.
 2014-01-30 14:16:47 +09:00
Yasuo Ohgaki
b1c0614ecc Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug data->fd not set to -1 for open_basedir failure.
 2014-01-30 14:16:05 +09:00
Yasuo Ohgaki
f5e097d1ed Fixed bug data->fd not set to -1 for open_basedir failure. 2014-01-30 14:15:29 +09:00
Daniel Lowrey
ba8cdc855d Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed build breakage from b4b4d9697f
 2014-01-29 17:59:46 -07:00
Daniel Lowrey
43432c12f1 Fixed build breakage from b4b4d9697f 2014-01-29 17:57:59 -07:00
Anatol Belski
c91ad8233b fix merge error after b4b4d9697f 2014-01-29 22:50:56 +01:00
Andrey Hristov
79e0c273b8 Merge branch 'master' of git.php.net:php-src 
Conflicts:
	ext/openssl/xp_ssl.c
 2014-01-29 15:33:52 +02:00
Andrey Hristov
1c7f54d4f7 Merge branch 'PHP-5.6' 
Conflicts:
	NEWS
	ext/openssl/xp_ssl.c
 2014-01-29 15:32:02 +02:00
Andrey Hristov
253a66c8d5 Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6 2014-01-29 15:28:47 +02:00
Andrey Hristov
7807d7d0ce Add new INI for rollbacking connections put back into the pconn pool 
as well a function get the the statistics in easier way than ob_start()
and parsing phpinfo().
 2014-01-29 15:27:43 +02:00
Remi Collet
cbb1097770 Merge branch 'PHP-5.6' 
* PHP-5.6:
  zip extension version 1.12.4
 2014-01-29 14:01:03 +01:00
Remi Collet
f06f4c9254 zip extension version 1.12.4 2014-01-29 14:00:50 +01:00
Remi Collet
83c302840e Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed Request #66574 Allow multiple paths in php_ini_scanned_path
 2014-01-29 09:57:22 +01:00
Remi Collet
0fad6dbef3 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed Request #66574 Allow multiple paths in php_ini_scanned_path
 2014-01-29 09:57:04 +01:00
Remi Collet
da84f3af75 Fixed Request #66574 Allow multiple paths in php_ini_scanned_path 
php_ini_scanned_path, from --with-config-file-scan-dir option or
from PHP_INI_SCAN_DIR environment variable allow a single path.

In some case it could be useful to allow multiple.

In the proposed patch, multiple paths are allow, using syntax inspired
from Unix MANPATH (: separated list, empty string for builtin value).

For example, this allow to use:
PHP_INI_SCAN_DIR=/foo/php.d:/bar/php.d   php
PHP_INI_SCAN_DIR=:/myproject/php.d       php
PHP_INI_SCAN_DIR=/myproject/php.d:       php

Real use case: in SCL for dependent collections where each collection
provides a separate tree for extensions, libraries and ini files.
 2014-01-29 09:53:22 +01:00
Yasuo Ohgaki
3828b5d83d Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed zend.multibyte tests partially
 2014-01-29 15:56:13 +09:00
Yasuo Ohgaki
a6ac64bdbb Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed zend.multibyte tests partially
 2014-01-29 15:53:57 +09:00
Yasuo Ohgaki
3182660c04 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed zend.multibyte tests partially
 2014-01-29 15:51:47 +09:00
Yasuo Ohgaki
d941ac5b4f Fixed zend.multibyte tests partially 2014-01-29 15:41:30 +09:00
Daniel Lowrey
6edc84fcdf Merge branch 'PHP-5.6' 
* PHP-5.6:
  Update NEWS/UPGRADING
  Verify peers by default in client socket operations

Conflicts:
	ext/openssl/xp_ssl.c
 2014-01-28 10:36:28 -07:00
Daniel Lowrey
7a90254231 Update NEWS/UPGRADING 2014-01-28 10:27:00 -07:00
Daniel Lowrey
b4b4d9697f Verify peers by default in client socket operations 2014-01-28 10:05:56 -07:00