clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-02 15:26:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
75,821 Commits 494 Branches 1,367 Tags 807 MiB
524fab3e41
Commit Graph

75821 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stanislav Malyshev
524fab3e41 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Expose fputcsv's escape_char to userland
 2013-08-24 20:46:03 -07:00
Joey Smith
2139d2702d Expose fputcsv's escape_char to userland 
Allows users to assert that something other than the backslash
should be considered an escape char; also follows the RFC 4180
recommendation that fields containing a " be enclosed.
 2013-08-24 20:45:14 -07:00
Stanislav Malyshev
3e4f862076 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fix #65483: quoted-printable encode stream filter incorrectly encoding spaces
  Update NEWS
 2013-08-24 19:50:11 -07:00
Stanislav Malyshev
8ee126f0bb Merge branch 'pull-request/414' 
* pull-request/414:
  Fix #65483: quoted-printable encode stream filter incorrectly encoding spaces
 2013-08-24 19:49:59 -07:00
Stanislav Malyshev
bdccf0a61d Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix #65483: quoted-printable encode stream filter incorrectly encoding spaces
  Update NEWS
 2013-08-24 19:49:27 -07:00
Michael M Slusarz
3f9af558e7 Fix #65483: quoted-printable encode stream filter incorrectly encoding spaces 2013-08-24 19:45:54 -07:00
Anatol Belski
07fa043cc3 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Suppress static analyzer warnings in specialized executor
  Update NEWS
 2013-08-23 17:45:45 +02:00
Anatol Belski
716fc80fda Suppress static analyzer warnings in specialized executor 
As things like if(0) will be removed by the compiler, no need
to see that tons of warnings with static analyzer enabled.
 2013-08-23 17:41:07 +02:00
Christopher Jones
38f9c515cd Update NEWS 2013-08-23 08:18:33 -07:00
Christopher Jones
768c34e7cd Update NEWS 2013-08-23 08:13:59 -07:00
Anatol Belski
77303a3248 Merge branch 'PHP-5.5' 
* PHP-5.5:
  ensure the test doesn't fail because of tz warning
 2013-08-23 16:41:02 +02:00
Anatol Belski
a2b1546f3b ensure the test doesn't fail because of tz warning 2013-08-23 16:40:28 +02:00
Nikita Popov
c0856a178f Merge branch 'PHP-5.5' 2013-08-23 13:30:46 +02:00
Nikita Popov
686402a865 Merge branch 'PHP-5.4' into PHP-5.5 2013-08-23 13:28:59 +02:00
Christopher Jones
5ab6d215fc Remove duplicate calls to set filename & lineno for the DTRACE_FUNCTION_ENTRY/RETURN cases 2013-08-23 13:27:42 +02:00
Christopher Jones
27954a8b8a Merge branch 'PHP-5.5' 
* PHP-5.5:
  Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type"
  Revert "Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type""
  Revert "Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type""
 2013-08-22 09:07:07 -07:00
Christopher Jones
c1ecdfbf6e Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type"
  Revert "Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type""
 2013-08-22 09:06:43 -07:00
Christopher Jones
7109f369e8 Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type" 2013-08-22 09:05:52 -07:00
Christopher Jones
18282f42c5 Revert "Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type"" 
This reverts commit f38bd22ed2.
 2013-08-22 08:58:35 -07:00
Christopher Jones
f2ceb4963e Revert "Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type"" 
This reverts commit f38bd22ed2.
 2013-08-22 08:58:24 -07:00
Christopher Jones
a61f5bf925 Revert "Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type"" 
This reverts commit f38bd22ed2.
 2013-08-22 08:57:18 -07:00
Matteo Beccati
80917e5ca2 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed other compiler warnings
 2013-08-22 15:34:22 +02:00
Matteo Beccati
908da14bd1 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed other compiler warnings
 2013-08-22 15:34:11 +02:00
Matteo Beccati
d5987478a8 Fixed other compiler warnings 2013-08-22 15:33:54 +02:00
Nikita Popov
926987bdc7 Merge branch 'PHP-5.5' 2013-08-22 14:07:32 +02:00
Nikita Popov
c0d99fd76a Apply pgsql notice test fixes to PHP-5.5 2013-08-22 14:02:55 +02:00
Nikita Popov
1a88fcc2d8 Remove trailing whitespace in test 
Third try to make this work...
 2013-08-22 13:09:53 +02:00
Nikita Popov
96045e1b33 Forgot newline in test 2013-08-22 12:26:34 +02:00
Nikita Popov
647059abc7 Merge branch 'PHP-5.5' 2013-08-22 11:47:55 +02:00
Nikita Popov
592677d810 Fix intl build 
Turns out that you can't use implicit void pointer casts if intl
is compiled.
 2013-08-22 11:46:51 +02:00
Nikita Popov
b668a26c2f Fix pgsql notice test failure 2013-08-22 11:31:56 +02:00
Christopher Jones
e212320a0c Remove duplicate calls to set filename & lineno for the DTRACE_FUNCTION_ENTRY/RETURN cases 2013-08-22 11:23:07 +02:00
Nikita Popov
4db494a3ab Merge branch 'PHP-5.5' 2013-08-22 11:01:19 +02:00
Nikita Popov
fc16b92313 Fix bug #46311: Pointer aliasing issue results in miscompile on gcc4.4 
The code violated the strict aliasing restriction, because it
dereferenced the same pointer as zval** once and as void**
afterwards. Now both occurances dereference void** and cast to
zval* in the former case.
 2013-08-22 10:56:50 +02:00
Christopher Jones
9507fcfdc5 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Suppress compiler warning "warning: variable ‘length’ set but not used [-Wunused-but-set-variable]"
  Suppress compiler warning "warning: variable ‘retcount’ set but not used [-Wunused-but-set-variable]"
 2013-08-21 15:43:33 -07:00
Christopher Jones
11087eece7 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Suppress compiler warning "warning: variable ‘length’ set but not used [-Wunused-but-set-variable]"
  Suppress compiler warning "warning: variable ‘retcount’ set but not used [-Wunused-but-set-variable]"
 2013-08-21 15:43:19 -07:00
Christopher Jones
54d4a28003 Suppress compiler warning "warning: variable ‘length’ set but not used [-Wunused-but-set-variable]" 2013-08-21 15:39:14 -07:00
Christopher Jones
1af111dd68 Suppress compiler warning "warning: variable ‘retcount’ set but not used [-Wunused-but-set-variable]" 2013-08-21 15:37:02 -07:00
Christopher Jones
0b60f32247 Merge branch 'master' of https://git.php.net/repository/php-src 
* 'master' of https://git.php.net/repository/php-src:
  Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type"
 2013-08-21 15:23:50 -07:00
Christopher Jones
d2a2e949fe Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5 
* 'PHP-5.5' of https://git.php.net/repository/php-src:
  Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type"
 2013-08-21 15:23:48 -07:00
Christopher Jones
d0bede2efa Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4 
* 'PHP-5.4' of https://git.php.net/repository/php-src:
  Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type"
 2013-08-21 15:23:48 -07:00
Christopher Jones
71ba571e53 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type"
 2013-08-21 15:07:13 -07:00
Christopher Jones
9895e8bbe6 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type"
 2013-08-21 15:07:03 -07:00
Christopher Jones
f38bd22ed2 Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type" 2013-08-21 15:06:23 -07:00
Christopher Jones
d9bfe06194 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Reduce compilation noise during normal compilation:     php-5.5/ext/session/session.c:836: warning: unused variable ‘struc’     php-5.5/ext/session/session.c:836: warning: unused variable ‘num_key’     php-5.5/ext/session/session.c:836: warning: unused variable ‘key_length’     php-5.5/ext/session/session.c:836: warning: unused variable ‘key’     php-5.5/ext/session/session.c:835: warning: unused variable ‘key_type’     php-5.5/ext/session/session.c:834: warning: unused variable ‘_ht’     php-5.5/ext/session/session.c:857: warning: unused variable ‘has_value’     php-5.5/ext/session/session.c:856: warning: unused variable ‘namelen’     php-5.5/ext/session/session.c:853: warning: unused variable ‘name’     php-5.5/ext/session/session.c:852: warning: unused variable ‘p’
 2013-08-21 10:35:07 -07:00
Christopher Jones
d85827fb7f Reduce compilation noise during normal compilation: 
php-5.5/ext/session/session.c:836: warning: unused variable ‘struc’
    php-5.5/ext/session/session.c:836: warning: unused variable ‘num_key’
    php-5.5/ext/session/session.c:836: warning: unused variable ‘key_length’
    php-5.5/ext/session/session.c:836: warning: unused variable ‘key’
    php-5.5/ext/session/session.c:835: warning: unused variable ‘key_type’
    php-5.5/ext/session/session.c:834: warning: unused variable ‘_ht’
    php-5.5/ext/session/session.c:857: warning: unused variable ‘has_value’
    php-5.5/ext/session/session.c:856: warning: unused variable ‘namelen’
    php-5.5/ext/session/session.c:853: warning: unused variable ‘name’
    php-5.5/ext/session/session.c:852: warning: unused variable ‘p’

    php-5.5/ext/session/mod_user.c:191: warning: unused variable ‘ret’
 2013-08-21 10:34:09 -07:00
Michael Wallner
4abee3730f Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fix pointer sign warning showing up in EVERY build
 2013-08-21 19:18:29 +02:00
Michael Wallner
6181948592 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix pointer sign warning showing up in EVERY build
 2013-08-21 19:18:11 +02:00
Michael Wallner
d8023d13eb Fix pointer sign warning showing up in EVERY build 2013-08-21 19:17:22 +02:00
Anthony Ferrara
90b489f826 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fix return types of password API helper functions.
 2013-08-21 12:11:10 -04:00