clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-01 23:06:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
75,617 Commits 494 Branches 1,367 Tags 802 MiB
de0a602ce1
Commit Graph

75617 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christopher Jones
de0a602ce1 Merge branch 'master' of https://git.php.net/repository/php-src 
* 'master' of https://git.php.net/repository/php-src:
  Fixed #65431 in zend_exception.c by Sixd
 2013-08-14 21:32:20 -07:00
Christopher Jones
ac03b67e6a Remove unused variable 2013-08-14 21:21:17 -07:00
Christopher Jones
4824d0f43e Merge branch 'PHP-5.5' 
* PHP-5.5:
  Reduce compiler noise by removing unused variables and labels
 2013-08-14 21:08:55 -07:00
Christopher Jones
cd14de94d2 Reduce compiler noise by removing unused variables and labels 2013-08-14 21:06:59 -07:00
Xinchen Hui
7d3ec0c3ca Merge branch 'PHP-5.5' 2013-08-15 11:50:54 +08:00
Xinchen Hui
cb361ed27e Merge branch 'PHP-5.4' into PHP-5.5 2013-08-15 11:49:59 +08:00
Xinchen Hui
8280393828 Fixed #65431 in zend_exception.c by Sixd 2013-08-15 11:47:44 +08:00
Christopher Jones
3c166c4758 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings.

Conflicts:
	ext/gmp/gmp.c
 2013-08-14 20:47:00 -07:00
Christopher Jones
39612afc72 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings.

Conflicts:
	ext/dba/libinifile/inifile.c
 2013-08-14 20:43:25 -07:00
Christopher Jones
9ad97cd489 Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings. 2013-08-14 20:36:50 -07:00
Christopher Jones
759517651e Merge branch 'PHP-5.5' 
* PHP-5.5:
  Skip test if SKIP_ONLINE_TESTS set
 2013-08-14 15:47:42 -07:00
Christopher Jones
8c61758dc7 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Skip test if SKIP_ONLINE_TESTS set
 2013-08-14 15:45:46 -07:00
Christopher Jones
9d62807190 Skip test if SKIP_ONLINE_TESTS set 2013-08-14 15:45:06 -07:00
Anatol Belski
9d4e5b0dba Fix to file uploads >2G with size overflow 
Represent the file size as string when the total size would overflow
LONG_MAX. Otherwise while file itself were uploaded, the size would
be shown wrong. This mostly applies to systems with 32 bit long.
 2013-08-14 18:59:46 +02:00
Stanislav Malyshev
4da6273092 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fix CVE-2013-4073 - handling of certs with null bytes
  Fix CVE-2013-4073 - handling of certs with null bytes
 2013-08-13 22:26:32 -07:00
Stanislav Malyshev
2b9f5ac252 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix CVE-2013-4073 - handling of certs with null bytes
  Fix CVE-2013-4073 - handling of certs with null bytes
 2013-08-13 22:25:47 -07:00
Stanislav Malyshev
7f69f07fc1 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix CVE-2013-4073 - handling of certs with null bytes
 2013-08-13 22:24:29 -07:00
Stanislav Malyshev
dcea4ec698 Fix CVE-2013-4073 - handling of certs with null bytes 2013-08-13 22:24:11 -07:00
Stanislav Malyshev
2874696a5a Fix CVE-2013-4073 - handling of certs with null bytes 2013-08-13 22:20:33 -07:00
Xinchen Hui
b6fa0b40f7 Merge branch 'PHP-5.5' 2013-08-14 11:44:53 +08:00
Xinchen Hui
f3d18add08 Merge branch 'PHP-5.4' into PHP-5.5 2013-08-14 11:44:37 +08:00
Xinchen Hui
f4dc2240a0 Fixed #65431 (Discarded qualifiers from pointer target warnings when using --enable-dtrace) by Sixd 2013-08-14 11:42:39 +08:00
Christopher Jones
f95cd93408 Fix unused variable warning in OCI8 2.0 2013-08-13 15:15:57 -07:00
Anatol Belski
c5674bb502 Merge branch 'PHP-5.5' 
* PHP-5.5:
  removed unused vars
 2013-08-12 15:53:34 +02:00
Anatol Belski
bab33f7e05 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  removed unused vars
 2013-08-12 15:52:50 +02:00
Anatol Belski
72aacbf735 removed unused vars 2013-08-12 15:52:15 +02:00
Anatol Belski
42171b13f4 Merge branch 'PHP-5.5' 
* PHP-5.5:
  fixed strndup usage in the pgsql ext
 2013-08-12 15:45:43 +02:00
Anatol Belski
87198989cd Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fixed strndup usage in the pgsql ext
 2013-08-12 15:45:26 +02:00
Anatol Belski
4134ebec8e fixed strndup usage in the pgsql ext 2013-08-12 15:44:47 +02:00
Anatol Belski
acea91b18c Fixes to unified stdint usage 
This recalls 14caf174ff
 2013-08-12 13:39:17 +02:00
Dmitry Stogov
52dac3e8cd Fixed bug #65382 (Segfault in closure_030.phpt) 2013-08-12 10:53:20 +04:00
Yasuo Ohgaki
3ada3aaea6 Revise pgsql test files 2013-08-12 05:14:43 +09:00
Yasuo Ohgaki
727318546d Revise pgsql test for Travis CI 2013-08-11 18:57:39 +09:00
Yasuo Ohgaki
713aedfe65 Add 00version.phpt to get server/protocol/client version. Revise test script description 2013-08-11 18:33:33 +09:00
Stanislav Malyshev
6e92f07926 Merge branch 'PHP-5.5' 
* PHP-5.5:
  use mysqlnd, some tests fail otherwise
 2013-08-11 01:37:44 -07:00
Stanislav Malyshev
76fd13f742 use mysqlnd, some tests fail otherwise 2013-08-11 01:36:59 -07:00
Stanislav Malyshev
6c494edfb7 Merge branch 'PHP-5.5' 
* PHP-5.5:
  ensure notices are not ignored when tests need them
 2013-08-10 23:13:09 -07:00
Stanislav Malyshev
29f1aa2618 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  ensure notices are not ignored when tests need them
 2013-08-10 23:12:51 -07:00
Stanislav Malyshev
cf39c3d638 ensure notices are not ignored when tests need them 2013-08-10 23:12:04 -07:00
Stanislav Malyshev
d8a2779456 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Embeds the content of the DTD in the DOCTYPE declaration of the XML files.
  Adds 2 new xml files which include the dtd path relative to the base directory for the php source code. It fixs the fail on the load of the dtd in the tests modified by this commit.
  Adds files: error 1 to 5 and variation 1 to 4
 2013-08-10 18:03:07 -07:00
Antonio Diaz Ruiz
1a5c460ea2 Embeds the content of the DTD in the DOCTYPE declaration of the XML files. 2013-08-10 18:02:08 -07:00
Antonio Diaz Ruiz
5f5ff92bc0 Adds 2 new xml files which include the dtd path relative to the base directory for the php source code. 
It fixs the fail on the load of the dtd in the tests modified by this commit.
 2013-08-10 18:02:00 -07:00
Antonio Diaz Ruiz
24f36934ad Adds files: error 1 to 5 and variation 1 to 4 
tests for error1: not well formed xml

tests for error2: not well formed xml attribute without colon

tests for error2: not well formed xml, typo

tests for error4: wrong xml version

tests for error5: extra content at the end of the doc

tests libxml_dtd_load

tests libxml_dtd_valid

tests for libdtd_noerror

tests for LIBXML_DTDATTR, LIBXML_NOCDATA, LIBXML_NOENT and LIBXML_NOBLANKS

the basic behavior

fix comments
 2013-08-10 18:01:54 -07:00
Stanislav Malyshev
3db907b803 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Add schema default/fixed value support
 2013-08-10 17:56:46 -07:00
Stanislav Malyshev
473d66553d Merge branch 'pull-request/325' into PHP-5.5 
* pull-request/325:
  Add schema default/fixed value support
 2013-08-10 17:56:23 -07:00
Stanislav Malyshev
871e937df7 Merge branch 'pull-request/402' 
* pull-request/402:
  bison upgrading notes
  use $YACC instead of 'bison' as suggested by Yasuo
  improve comments and messages as suggested
  add excluded version exmaple
  make the bison version check a blacklist
 2013-08-10 17:39:06 -07:00
Stanislav Malyshev
3c349cfa50 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fix #61345: fix install of CGI binary
  Fix #61345: fix install of CGI binary
 2013-08-10 17:36:17 -07:00
Stanislav Malyshev
6b4971a29b Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix #61345: fix install of CGI binary
 2013-08-10 17:35:52 -07:00
Michael Heimpold
36b759d1dd Fix #61345: fix install of CGI binary 
When CLI was not built but only CGI binary, then a sequence of

$ ./buildconf
$ ./configure  --prefix=/usr/local/phpcgi --disable-cli
$ make -j8
$ sudo rm -rf /usr/local/phpcgi
$ sudo make install

results in the following error:

/bin/bash /srv/smb/php-src.test/libtool --silent --preserve-dup-deps --mode=install cp ext/opcache/opcache.la /srv/smb/php-src.test/modules
Installing shared extensions:     /usr/local/phpcgi/lib/php/extensions/no-debug-non-zts-20121212/
Installing PHP CGI binary:        /usr/local/phpcgi/bin/
cp: cannot create regular file `/usr/local/phpcgi/bin/#INST@28245#': No such file or directory
make: *** [install-cgi] Fehler 1

The solution is to create the binary directory before copying the
CGI binary as e.g. CLI does.

Signed-off-by: Oliver Metz <oliver.metz@gmx.de>

[extensive commit message]

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
 2013-08-10 17:35:09 -07:00
Stanislav Malyshev
3f99ba6351 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix #61345: fix install of CGI binary
 2013-08-10 17:33:28 -07:00