← Back to branch summary

~ubuntu-branches/ubuntu/trusty/uwsgi/trusty

« back to all changes in this revision

Viewing changes to yaml.c

  • Committer: Package Import Robot
  • Author(s): Janos Guljas
  • Date: 2012-02-13 03:43:28 UTC
  • mfrom: (1.1.3)
  • Revision ID: package-import@ubuntu.com-20120213034328-d02hz8m5pon6kaxf
Tags: 1.0.3+dfsg-1
http://bugs.debian.org/640698
http://bugs.debian.org/656280
http://bugs.debian.org/654333
* New upstream version.
* Adjust rack plugin LD_RUN_PATH patch.
* Adjust patch for uWSGI Control Center jQuery links in templates.
* Remove '-fno-strict-aliasing' CFLAG patch as it is implemented upstream.
* Remove fix indentation of uwsgidecorators_py patch as implemented upstream.
* Adjust init scripts to use top-bottom options order, as --inherit option
  is not working as in earlier versions. 
* Update debian/copyright file.
* Add LSB Description field to debian/uwsgi.init.d.
* Set Architecture to "all" for binary package uwsgi-extra because
  it contains no architecture dependent files.
* Change uwsgi description. (Closes: #640698)
* New binary packages:
  - uwsgi-plugin-carbon
  - uwsgi-plugin-graylog2
  - uwsgi-plugin-logsocket
  - uwsgi-plugin-probeconnect
  - uwsgi-plugin-probepg
  - uwsgi-plugin-rrdtool
  - uwsgi-plugin-rsyslog
  - uwsgi-plugin-signal
  - uwsgi-plugin-symcall
  - uwsgi-plugin-syslog
* python-uwsgidecorators:
  - fix binary-install rule to call dh_python2
  - remove debian/source.lintian-overrides
* uwsgi-plugin-jvm-openjdk-6:
  - fix FTBFS on armel and powerpc (Closes: #656280)
* uwsgi-plugin-python:
  - document issue "ImportError: No module named site" when using
    virtualenv with Python 2.6 in README.Debian (Closes: #654333)
* Adjust debian/watch uversionmangle option.
* Repack upstram source to remove minimized jQuery and jQuery UI JavaScript
  libraries:
  - add get-orig-source rule to debian/rules
  - append +dfsg to upstream version
  - update debian/watch with dversionmangle option

Show diffs side-by-side

added added

removed removed

Lines of Context:
yaml.c
107
107
        char *section_asked = "uwsgi";
108
108
        char *colon;
109
109
 
110
 
        if (!uwsgi_startswith(file, "http://", 7)) {
 
110
        if (uwsgi_check_scheme(file)) {
111
111
                colon = uwsgi_get_last_char(file, '/');
112
112
                colon = uwsgi_get_last_char(colon, ':');
113
113
        }
154
154
                        case YAML_VALUE_TOKEN:
155
155
                                status = 2;
156
156
                                break;
 
157
                        case YAML_FLOW_SEQUENCE_START_TOKEN:
 
158
                        case YAML_BLOCK_SEQUENCE_START_TOKEN:
 
159
                                status = 3;
 
160
                                break;
157
161
                        case YAML_BLOCK_MAPPING_START_TOKEN:
158
162
                                if (!in_uwsgi_section) {
159
163
                                        if (key) {
170
174
                                }
171
175
                                break;
172
176
                        case YAML_SCALAR_TOKEN:
 
177
                        case YAML_FLOW_ENTRY_TOKEN:
 
178
                        case YAML_BLOCK_ENTRY_TOKEN:
173
179
                                if (status == 1) {
174
180
                                        key = (char *) token.data.scalar.value;
175
181
                                }
180
186
                                        }
181
187
                                        status = 0;
182
188
                                }
 
189
                                else if (status == 3) {
 
190
                                        val = (char *) token.data.scalar.value; 
 
191
                                        if (key && val && in_uwsgi_section) {
 
192
                                                add_exported_option(key, val, 0);
 
193
                                        }
 
194
                                }
183
195
                                else {
184
196
                                        uwsgi_log("unsupported YAML token in %s block\n", section_asked);
185
197
                                        parsing = 0;